修改实名认证

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourBanner.java

@@ -70,5 +70,8 @@ public class TourBanner implements Serializable {
 	private Integer rank;
 
 
+	@Column(name = "type")
+	@ApiModelProperty(value = "类型")
+	private Integer type;
 
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourBannerBiz.java

@@ -22,15 +22,18 @@ import java.util.List;
 @Service
 public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
 
+
     @Autowired
     private RedisTemplate redisTemplate;
 
 //    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_BANNER)
-    public List<TourBanner> findBannerList() {
+    public List<TourBanner> findBannerList(Integer type) {
 
         TourBanner banner = new TourBanner();
         banner.setIsDel(0);
-        return  mapper.findBannerListByisDelOrderByRank(banner);
+        banner.setType(type);
+
+        return  mapper.findBannerListByIsDelOrderByRank(banner);
     }
 
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourBannerMapper.java

@@ -17,6 +17,6 @@ import java.util.List;
 @Repository
 public interface TourBannerMapper extends Mapper<TourBanner> {
 
-    @Select("select * from tour_banner where is_del=${isDel} order by rank ASC")
-   List<TourBanner> findBannerListByisDelOrderByRank(TourBanner banner);
+    @Select("select * from tour_banner where is_del=${isDel} and type=${type} order by rank ASC")
+   List<TourBanner> findBannerListByIsDelOrderByRank(TourBanner banner);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourBannerController.java

@@ -27,9 +27,12 @@ public class TourBannerController extends BaseController<TourBannerBiz,TourBanne
      * @return
      */
     @GetMapping("/app/unauth/findBannerlist")
-    public ObjectRestResponse findBannerlist(){
+    public ObjectRestResponse findBannerlist(@RequestParam("type") Integer type){
 
-        List<TourBanner> bannerList = bannerBiz.findBannerList();
+        if (type==null||type!=0||type==1) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+        List<TourBanner> bannerList = bannerBiz.findBannerList(type);
 
 
         return  ObjectRestResponse.succ(bannerList);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CertificationController.java

@@ -34,8 +34,8 @@ public class CertificationController {
 
 
 
-    @PostMapping("/app/Certificate")
-    public ObjectRestResponse  Certificate(@RequestBody IdInformation idInformation, HttpServletRequest request) {
+    @PostMapping("/app/certificate")
+    public ObjectRestResponse  certificate(@RequestBody IdInformation idInformation, HttpServletRequest request) {
 
 
         if (idInformation == null) {
@@ -79,17 +79,14 @@ public class CertificationController {
             return orr;
         }
 
-        Integer am = idInformation.getAuthenticationMethods();
+
         Integer type = idInformation.getCertificateType();
 
 
         try {
-            if (type==0&&am==0){
-                 return certificationService.stringCertificate(idInformation);
-             }
+            if (type!=null&&type==0){
+                 return certificationService.certificate(idInformation);
 
-            if (type==0&&am==1){
-                return certificationService.imageCertificate(idInformation);
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -134,96 +134,115 @@ public class CertificationService {
     private UserFeign userFeign;
 
 
-    //身份证号+姓名认证
-
-    public ObjectRestResponse stringCertificate(IdInformation idInformation) {
-        HashedMap hashMap = new HashedMap();
-        // 认证状态:true是认证过
-
+//    //身份证号+姓名认证
+//
+//    public ObjectRestResponse stringCertificate(IdInformation idInformation) {
+//        HashedMap hashMap = new HashedMap();
+//        // 认证状态:true是认证过
+//
+//
+//        Integer certificateType = idInformation.getCertificateType();
+//        if (certificateType == 0) {
+//
+//            if (!Validation.isIdCard(idInformation.getIdNumber())) {
+//                return ObjectRestResponse.createFailedResult(ResultCode.WRONG_FORMAT_OF_ID_CARD, "身份证格式错误");
+//            }
+//        }
+//
+//
+//        if (idInformation == null) {
+//
+//
+//            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "未填写");
+//
+//
+//        }
+//
+//        if (idInformation.getExpirationDate() == null) {
+//
+//            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写证件到期时间");
+//        }
+//
+//
+//        //判断是否有填写身份证号
+//        if (StringUtils.isBlank(idInformation.getIdNumber())) {
+//            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写身份证号");
+//
+//
+//        }
+//
+//        //判断是有否填写名字
+//        if (StringUtils.isBlank(idInformation.getName())) {
+//
+//            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写姓名");
+//
+//        }
+//
+//        //获取查询参数
+//        Map<String, String> querys = new HashMap<String, String>();
+//        querys.put(idCardName, idInformation.getIdNumber());
+//
+//        querys.put(cName, idInformation.getName());
+//
+//        //认证
+//        String result = certificate(querys);
+//        System.out.println(result);
+//
+//        //判断返回的值是否为空
+//        if (!StringUtils.isBlank(result)) {
+//
+//            Map<String, String> resultMap = (Map<String, String>) JSONObject.parse(result);
+//
+//            if (resultMap != null) {
+//                //认证成功
+//                if (certifResultCode.equals(resultMap.get(certifRet))) {
+//                    Boolean aBoolean = addIdInformation(idInformation);
+//                    if (aBoolean) {
+//
+//                        return ObjectRestResponse.succ();
+//                    }
+//
+//
+//                }
+//            }
+//        }
+//        return ObjectRestResponse.createDefaultFail();
+//
+//
+//    }
 
-        Integer certificateType = idInformation.getCertificateType();
-        if (certificateType == 0) {
 
-            if (!Validation.isIdCard(idInformation.getIdNumber())) {
-                return ObjectRestResponse.createFailedResult(ResultCode.WRONG_FORMAT_OF_ID_CARD, "身份证格式错误");
-            }
-        }
+//     身份证图片进行实名认证
 
+    public ObjectRestResponse certificate(IdInformation idInformation) {
+        //1.判断
+        //携带返回参数的map
+        HashedMap hashMap = new HashedMap();
+        // 认证状态:true是认证过
 
+        //判断是否map是否为null
         if (idInformation == null) {
 
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请提供资料");
 
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "未填写");
-
-
-        }
-
-        if (idInformation.getExpirationDate() == null) {
-
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写证件到期时间");
         }
 
-
         //判断是否有填写身份证号
         if (StringUtils.isBlank(idInformation.getIdNumber())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写身份证号");
-
-
-        }
-
-        //判断是有否填写名字
-        if (StringUtils.isBlank(idInformation.getName())) {
 
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写姓名");
 
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "未填写证件号");
         }
 
-        //获取查询参数
-        Map<String, String> querys = new HashMap<String, String>();
-        querys.put(idCardName, idInformation.getIdNumber());
-
-        querys.put(cName, idInformation.getName());
-
-        //认证
-        String result = certificate(querys);
-        System.out.println(result);
-
-        //判断返回的值是否为空
-        if (!StringUtils.isBlank(result)) {
-
-            Map<String, String> resultMap = (Map<String, String>) JSONObject.parse(result);
-
-            if (resultMap != null) {
-                //认证成功
-                if (certifResultCode.equals(resultMap.get(certifRet))) {
-                    Boolean aBoolean = addIdInformation(idInformation);
-                    if (aBoolean) {
-
-                        return ObjectRestResponse.succ();
-                    }
-
-
-                }
-            }
+        if (!Validation.isIdCard(idInformation.getIdNumber())) {
+            return ObjectRestResponse.createFailedResult(ResultCode.WRONG_FORMAT_OF_ID_CARD, "填写的证件格式错误");
         }
-        return ObjectRestResponse.createDefaultFail();
 
 
-    }
-
-
-//     身份证图片进行实名认证
-
-    public ObjectRestResponse imageCertificate(IdInformation idInformation) {
-        //1.判断
-        //携带返回参数的map
-        HashedMap hashMap = new HashedMap();
-        // 认证状态:true是认证过
-
-        //判断是否map是否为null
-        if (idInformation == null) {
+        //判断是有否填写名字
+        if (StringUtils.isBlank(idInformation.getName())) {
 
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请上传证件照");
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "未填写姓名");
 
         }
 
@@ -246,42 +265,51 @@ public class CertificationService {
 
         //正面进行解析
         String front = imageParse(idInformation.getFrontUrl(), frontParameter);
-
-        Map frontMap = (Map) JSONObject.parse(front);
-
-        //反面进行解析
         String back = imageParse(idInformation.getBackUrl(), backParameter);
 
-        Map backMap = (Map) JSONObject.parse(back);
+        if (StringUtils.isBlank(front) || StringUtils.isBlank(back)) {
+            return ObjectRestResponse.createDefaultFail();
+        }
 
-        Map frontData = (Map) frontMap.get(dataNam);
 
-        Map backData = (Map) backMap.get(dataNam);
+        Map frontMap = (Map) JSONObject.parse(front);
+        //反面进行解析
+        Map backMap = (Map) JSONObject.parse(back);
         //判断是否调用图片解析的接口是否异常,若果两个次认证都没结果
         if (MapUtil.isEmpty(frontMap)
-                || MapUtil.isEmpty(backMap)
                 || !(frontMap.get(imageRet).equals(imageResultCode))
-                || MapUtil.isEmpty(frontData)
+                || MapUtil.isEmpty(backMap)
+                || !(backMap.get(imageRet).equals(imageResultCode))
 
-        ) {
+        ){
 
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "正面照认证失败");
+            return ObjectRestResponse.createDefaultFail();
         }
 
+        Map frontData = (Map) frontMap.get(dataNam);
+
+        Map backData = (Map) backMap.get(dataNam);
 
-        if (MapUtil.isEmpty(frontMap)
-                || MapUtil.isEmpty(backMap)
-                || !(backMap.get(imageRet).equals(imageResultCode))
-                || MapUtil.isEmpty(backData)
-        ) {
 
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "背面照认证失败");
+        if (MapUtil.isEmpty(backData)||MapUtil.isEmpty(frontData)){
+
+            return ObjectRestResponse.createDefaultFail();
         }
 
-        //图片解析没问提,进行身份认证
+        //解析通过,进行匹配
+
+        String name = (String) frontData.get(iName);
+
+        String number = (String) frontData.get(numberName);
 
 
-        ;
+        if (idInformation.getName().equals(name)) {
+            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "姓名不一致");
+        }
+
+        if (idInformation.getIdNumber().equals(number)) {
+            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "证件号不一致");
+        }
 
 
         Map<String, String> authMap = new HashMap<>();

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -111,6 +112,15 @@ public class VehicleModel implements Serializable {
 	@Column(name = "score")
 	@ApiModelProperty(value = "评分")
 	private Integer score;
-	
 
+
+	@ApiModelProperty(value = "车型对应的车辆")
+    private List<Vehicle> vehicles;
+
+
+	@ApiModelProperty(value = "车辆总数")
+	private Integer  sum;
+
+	@ApiModelProperty(value = "可租借数量")
+    private Integer leasableQuantity;
 }

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-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 org.springframework.stereotype.Service;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
@@ -25,4 +27,14 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper,VehicleModel> {
         updateSelectiveById(model);
     }
 
+    public VehicleModel findVehicleModelPage(VehicleModelQueryCondition vmqc){
+
+
+        PageDataVO<VehicleModel> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
+                vmqc.getLimit(), ()  -> mapper.findVehicleModelPage(vmqc));
+
+
+        return null;
+    }
+
 }
\ No newline at end of file

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

@@ -116,13 +116,4 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         }
     }
 
-   public VehicleModel findVehicleModelPage(VehicleModel vm){
-
-
-
-
-
-        return null;
-   }
-
 }

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 tk.mybatis.mapper.common.Mapper;
 
 /**
@@ -11,4 +12,6 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-05-21 14:15:27
  */
 public interface VehicleModelMapper extends Mapper<VehicleModel> {
+
+    VehicleModel findVehicleModelPage(VehicleModelQueryCondition vmqc);
 }

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

@@ -9,6 +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.VModelDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,6 +25,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz,Vehic
     @Autowired
     VehiclePlatCataBiz vehiclePlatCataBiz;
 
+    @Autowired
+    VehicleModelBiz  vehicleModelBiz;
+
     //修改评分
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
     public RestResponse addScore(
@@ -47,17 +51,23 @@ public class VehicleModelController extends BaseController<VehicleModelBiz,Vehic
         return new ObjectRestResponse().data(vModelDetailVO);
     }
 
-
+    /**
+     * 车型列表查询
+     * @param vmqc 条件
+     * @return
+     */
     @ApiOperation("车型列表")
-    @RequestMapping(value = "/app/findVehicleModelPage", method = RequestMethod.GET)
-    public ObjectRestResponse<VModelDetailVO> findVehicleModelPage(@RequestBody@ApiParam("查询信息")VehicleModel vm){
+    @PostMapping(value = "/app/findVehicleModelPage")
+    public ObjectRestResponse<VModelDetailVO> findVehicleModelPage(
+            @RequestBody@ApiParam("查询条件") VehicleModelQueryCondition vmqc){
 
-        if (vm==null) {
+        if (vmqc==null||vmqc.getPage()<0||vmqc.getLimit()<=0) {
             return ObjectRestResponse.createDefaultFail();
         }
 
 
-        VehicleModel vehicleModel=vehiclePlatCataBiz.findVehicleModelPage(vm);
+
+        VehicleModel vehicleModel=vehicleModelBiz.findVehicleModelPage(vmqc);
         return  ObjectRestResponse.succ(vehicleModel);
     }
 

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleModelMapper">
+  <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>
+  </select>
+
+</mapper>
\ No newline at end of file