Merge branch 'feature-20200720' into 'test'

绑定接口调整

See merge request !28

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

@@ -114,6 +114,11 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
      */
      */
     @Value("${biz.check.validity.limit.time:24}")
     @Value("${biz.check.validity.limit.time:24}")
     private Integer checkValidityLimitTime;
     private Integer checkValidityLimitTime;
+    /**
+     * 可绑定车辆数
+     */
+    @Value("${biz.bind.count:5}")
+    private Integer bindCount;
 
 
     @Autowired
     @Autowired
     private StringRedisTemplate redisTemplate;
     private StringRedisTemplate redisTemplate;
@@ -133,7 +138,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
         boundQuery.eq("user_id", info.getUserId());
         boundQuery.eq("user_id", info.getUserId());
         boundQuery.eq("status", "1");
         boundQuery.eq("status", "1");
         List<ParkBindInfo> list = mapper.selectList(boundQuery);
         List<ParkBindInfo> list = mapper.selectList(boundQuery);
-        if (list != null && list.size() >= 3) {
+        if (list != null && list.size() >= bindCount) {
             return ResultGenerator.fail(ResultCode.BIND_NUM_ERROR);
             return ResultGenerator.fail(ResultCode.BIND_NUM_ERROR);
         }
         }
         /**
         /**

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/ResultCode.java

@@ -19,7 +19,7 @@ public enum ResultCode implements IStatusCode {
     REPEAT_SUBMIT(1004, "重复提交"),
     REPEAT_SUBMIT(1004, "重复提交"),
     PARAM_ERROR(1005, "参数错误"),
     PARAM_ERROR(1005, "参数错误"),
     BUSINESS_ERROR(1006, "业务错误"),*/
     BUSINESS_ERROR(1006, "业务错误"),*/
-    BIND_NUM_ERROR(1, "同一客户绑定认证不超过3辆"),
+    BIND_NUM_ERROR(1, "可绑定车辆数已用完"),
     UNBIND_TOTAL_ERROR(2, "30天内解绑次数超过10次,不能再次绑定认证"),
     UNBIND_TOTAL_ERROR(2, "30天内解绑次数超过10次,不能再次绑定认证"),
     USERID_PHONE_ERROR(3, "客户ID与手机号不一致"),
     USERID_PHONE_ERROR(3, "客户ID与手机号不一致"),
     CAR_MESSAGE_UNKNOWN(4, "车辆信息不存在"),
     CAR_MESSAGE_UNKNOWN(4, "车辆信息不存在"),