调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssAgencyConfig.java

@@ -27,7 +27,7 @@ public class AssAgencyConfig extends StringPropertyUUIDEntity {
     @Column(name = "DEAL_TYPE")
     private Integer dealType;// 不支持设备更换后处理方式 1-新版 2-提示用户
     @Column(name = "DEVICE_CHANGE_NOTICE")
-    private Boolean deviceChangeNotice;// 提示 dealType为2时必填
+    private String deviceChangeNotice;// 提示 dealType为2时必填
     @Column(name = "VEHICLE_CHANGE")
     private Boolean vehicleChange;// 支持车牌变更
     @Column(name = "DEVICE_CANCEL")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/agency/AgencyConfigManagerImpl.java

@@ -35,7 +35,7 @@ public class AgencyConfigManagerImpl extends RedisCacheManager implements Agency
 
     @Override
     public AgencyConfigResponse delete(AgencyConfigDeleteRequest req) throws ManagerException {
-        AssAgencyConfig agencyConfig = agencyConfigRepo.findByAgencyId(req.getAgencyId());
+        AssAgencyConfig agencyConfig = agencyConfigRepo.findById(req.getId()).orElse(null);
         if (agencyConfig == null){
             throw new ManagerException("未找到该条渠道信息。");
         }
@@ -53,12 +53,13 @@ public class AgencyConfigManagerImpl extends RedisCacheManager implements Agency
         if (agencyConfig != null){
             throw new ManagerException("该渠道已有权限记录。");
         }
+        checkReq(req.getDeviceChange(),req.getDealType(),req.getDeviceChangeNotice());
         agencyConfig = copyProperties(req, new AssAgencyConfig());
         agencyConfig.setCreateTime(LocalDateTime.now());
         agencyConfig.setUpdateTime(LocalDateTime.now());
         agencyConfig.setOpenId(findOpenIdByToken(req.getAccessToken()));
         agencyConfig.setStatus(EnableStatus.ENABLE);
-        agencyConfigRepo.merge(agencyConfig);
+        agencyConfigRepo.persist(agencyConfig);
         AgencyConfigResponse response = copyProperties(req, new AgencyConfigResponse());
         return response;
     }
@@ -69,8 +70,10 @@ public class AgencyConfigManagerImpl extends RedisCacheManager implements Agency
         if (agencyConfig == null){
             throw new ManagerException("未找到该条渠道信息。");
         }
+        checkReq(req.getDeviceChange(),req.getDealType(),req.getDeviceChangeNotice());
         BeanUtils.copyProperties(req,agencyConfig);
         agencyConfig.setUpdateTime(LocalDateTime.now());
+        agencyConfigRepo.merge(agencyConfig);
         AgencyConfigResponse response = copyProperties(req, new AgencyConfigResponse());
         return response;
     }
@@ -81,4 +84,17 @@ public class AgencyConfigManagerImpl extends RedisCacheManager implements Agency
             throw new ManagerException("没找到渠道。");
         }
     }
+    public void checkReq(Boolean deviceChange, Integer dealType, String deviceChangeNotice) throws ManagerException{
+        if (!deviceChange){
+            if (dealType == null){
+                throw new ManagerException("请选择处理方式。");
+            } else {
+                if (dealType == 2){
+                    if (deviceChangeNotice == null){
+                        throw new ManagerException("请填写提示。");
+                    }
+                }
+            }
+        }
+    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/agency/config/AgencyConfigAddRequest.java

@@ -22,7 +22,7 @@ public class AgencyConfigAddRequest extends AbstractStaffBizRequestDTO {
     private String noticeUrl;// 服务地址
     private Boolean deviceChange;// 支持设备更换
     private Integer dealType;// 不支持设备更换后处理方式 1-新版 2-提示用户
-    private Boolean deviceChangeNotice;// 提示 dealType为2时必填
+    private String deviceChangeNotice;// 提示 dealType为2时必填
     private Boolean vehicleChange;// 支持车牌变更
     private Boolean deviceCancel;// 支持设备注销
     private Boolean signChange;// 支持签约代扣信息变更

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/agency/config/AgencyConfigDeleteRequest.java

@@ -13,7 +13,7 @@ import lombok.Setter;
 public class AgencyConfigDeleteRequest extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "渠道编号")
-    private String agencyId;// 渠道编号
+    private String id;// 渠道编号
     @ApiModelProperty(value = "状态")
     private EnableStatus status;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/agency/config/AgencyConfigUpdateRequest.java

@@ -17,7 +17,7 @@ public class AgencyConfigUpdateRequest extends AbstractStaffBizRequestDTO {
     private String noticeUrl;// 服务地址
     private Boolean deviceChange;// 支持设备更换
     private Integer dealType;// 不支持设备更换后处理方式 1-新版 2-提示用户
-    private Boolean deviceChangeNotice;// 提示 dealType为2时必填
+    private String deviceChangeNotice;// 提示 dealType为2时必填
     private Boolean vehicleChange;// 支持车牌变更
     private Boolean deviceCancel;// 支持设备注销
     private Boolean signChange;// 支持签约代扣信息变更