Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -312,13 +312,13 @@ public class CertificationService {
             ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "证件号不一致");
         }
 
-
+       //map携带身份证和姓名进行认证
         Map<String, String> authMap = new HashMap<>();
         authMap.put(idCardName, (String) frontData.get(numberName));
 
         authMap.put(cName, (String) frontData.get(cName));
 
-        //3.认证
+        //3.调用接口进行认证
         String result = certificate(authMap);
         log.info("----认证结果result========="+result);
 
@@ -327,7 +327,6 @@ public class CertificationService {
 
             Map<String, Object> map = (Map<String, Object>) JSONObject.parse(result);
             log.info("----certifRet========="+certifRet);
-
             if (MapUtil.isNotEmpty(map) || certifResultCode.equals(map.get(certifRet))) {
 
                 //认证成功后存入保存到数据库

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -115,5 +115,17 @@ public class VehicleModel implements Serializable {
 
 	@Column(name = "hot_sign")
 	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
-	Integer hotSign;
+	private Integer hotSign;
+
+    @ApiModelProperty(value = "总数量")
+     private Integer sum;
+
+
+    @ApiModelProperty(value = "可租借数量")
+    private Integer leasableQuantity;
+
+
+    @ApiModelProperty(value = "车辆")
+    private  Vehicle vehicle;
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModelQueryCondition.java

-package com.xxfc.platform.vehicle.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Column;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 接收车型查询条件
- */
-@Data
-public class VehicleModelQueryCondition implements Serializable {
-    private static final long serialVersionUID = 1L;
-    //主键
-    @ApiModelProperty("主键")
-    private Integer id;
-
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-
-    @ApiModelProperty(value = "配置")
-    private List<String> config;
-
-
-    @ApiModelProperty(value = "关键字id")
-    private List<String> keyword;
-
-
-    @ApiModelProperty(value = "房车展示")
-    private String modelShow;
-
-
-    @ApiModelProperty(value = "参数")
-    private List<String> modelParam;
-
-    //价格
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    //价格
-    @ApiModelProperty(value = "押金")
-    private BigDecimal deposit;
-
-    //创建时间
-    @ApiModelProperty(value = "创建时间", hidden = true )
-    private Date crtTime;
-
-    //创建者id
-    @ApiModelProperty(value = "创建者id")
-    private Integer crtUser;
-
-    //创建者名称
-    @ApiModelProperty(value = "创建者名称")
-    private String crtName;
-
-    //创建者host
-    @Column(name = "crt_host")
-    @ApiModelProperty(value = "创建者host")
-    private String crtHost;
-
-    //修改时间
-    @ApiModelProperty(value = "修改时间", hidden = true )
-    private Date updTime;
-
-    //修改者
-    @ApiModelProperty(value = "修改者")
-    private Integer updUser;
-
-    //修改者名称
-    @ApiModelProperty(value = "修改者名称")
-    private String updName;
-
-    //修改者host
-    @ApiModelProperty(value = "修改者host")
-    private String updHost;
-
-    //评分
-    @ApiModelProperty(value = "评分")
-    private Integer score;
-
-
-    @ApiModelProperty(value = "车辆总数")
-    private Integer  sum;
-
-
-    @ApiModelProperty(value = "可租借数量")
-    private Integer leasableQuantity;
-}

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java

+package com.xxfc.platform.vehicle.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehicleModelQueryCondition {
+    @ApiModelProperty(value = "当前页")
+    private Integer page;
+    @ApiModelProperty(value = "每页条数")
+    private Integer limit;
+    @ApiModelProperty(value = "房车型号")
+    private String  vehileModel;
+    @ApiModelProperty(value = "房车名")
+    private String   vehileName;
+    @ApiModelProperty(value = "乘卧数")
+    private String   takeALieTheNumber;
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

 package com.xxfc.platform.vehicle.biz;
 
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.entity.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleModelMapper.java

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.entity.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import tk.mybatis.mapper.common.Mapper;
 
 /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -9,7 +9,7 @@ import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.entity.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -4,9 +4,19 @@
   <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.entity.VehicleModel"
           parameterMap="vehicleModel">
       select  * from  vehicle_model vm left join  vehicle v on vm.id=v.model_id and 1=1
-      <if test="">
+      <if test="vmqc.vehicleType!=null and vmqc.vehicleType!=''">
+       and  v.keyword like CONCAT('%,',#{vmqc.vehicleType},',%')
+      </if>
+
+      <if test="vmqc.vehicleName!=null and vmqc.vehicleName!=''">
+          and  v.name like CONCAT('%',#{vmqc.vehicleName},'%')
+      </if>
 
+      <if test="vmqc.takeAlieTheNumber!=null and vmqc.takeAlieTheNumber!=''">
+       and  v.keyword like CONCAT('%,',#{vmqc.takeAlieTheNumber},',%')
       </if>
+
+
   </select>
 
 </mapper>
\ No newline at end of file