managew 产品

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductAddRequestDto.java

@@ -17,6 +17,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -89,6 +90,7 @@ public class ProductAddRequestDto extends AbstractStaffBizRequestDTO {
     /** 违约金 信息  */
     @ApiModelProperty(value = "欠费月收比例")
     @NotNull
+    @Max(value = 100,message = "比例不能大于100")
     private Integer monthlyRate;
     /** 注销费 信息列表  */
     @ApiModelProperty(value = "注销年限")
@@ -100,9 +102,7 @@ public class ProductAddRequestDto extends AbstractStaffBizRequestDTO {
     private SecretKeyType deviceType;
     @ApiModelProperty(value = "部中心编号")
     private String centerNo;
-    @ApiModelProperty(value = "扣费渠道编号",required = true)
-    @NotBlank
-    private String deductionChannelsId;
+
     @ApiModelProperty(value = "车辆性质 1营运 2非营运 3营运和非营运",required = true)
     @NotNull
     private Integer useCharacter;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/product/ProductManagerImpl.java

@@ -17,6 +17,7 @@ import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.repo.jpa.request.IssueProductPageRequest;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -122,9 +123,12 @@ public class ProductManagerImpl extends RedisCacheManager implements ProductMana
             }
             issueProduct.setAmount(amount);
         }
-        issueProduct.setExtensionTool(String.join(",", req.getExtensionTool()));
-        issueProduct.setVanType(String.join(",", req.getVanType()));
-        issueProduct.setVehiclePalce(String.join(",", req.getVehiclePalce()));
+        issueProduct.setExtensionTool(String.join(StrUtil.COMMA, req.getExtensionTool()));
+        issueProduct.setVanType(String.join(StrUtil.COMMA, req.getVanType()));
+        issueProduct.setVehicleType(String.join(StrUtil.COMMA, req.getVehicleType()));
+        if (CollectionUtil.isNotEmpty(req.getVehiclePalce())){
+            issueProduct.setVehiclePalce(String.join(StrUtil.COMMA, req.getVehiclePalce()));
+        }
         Staff staff = staffRepo.findByStaffId(req.getStaffId());
         issueProduct.setOperateUserId(staff.getOpenId());
         issueProduct.setOperateUserName(staff.getStaffName());
@@ -265,9 +269,12 @@ public class ProductManagerImpl extends RedisCacheManager implements ProductMana
             issueProductPayRepo.deleteByfr(FeeCategory.AFTER, issueProduct.getReleaseId());
         }
         copyProperties(req, issueProduct);
-        issueProduct.setExtensionTool(String.join(",", req.getExtensionTool()));
-        issueProduct.setVanType(String.join(",", req.getVanType()));
-        issueProduct.setVehiclePalce(String.join(",", req.getVehiclePalce()));
+        issueProduct.setExtensionTool(String.join(StrUtil.COMMA, req.getExtensionTool()));
+        issueProduct.setVanType(String.join(StrUtil.COMMA, req.getVanType()));
+        issueProduct.setVehicleType(String.join(StrUtil.COMMA, req.getVehicleType()));
+        if (CollectionUtil.isNotEmpty(req.getVehiclePalce())) {
+            issueProduct.setVehiclePalce(String.join(StrUtil.COMMA, req.getVehiclePalce()));
+        }
         Staff staff = staffRepo.findByStaffId(req.getStaffId());
         issueProduct.setOperateUserId(staff.getOpenId());
         issueProduct.setOperateUserName(staff.getStaffName());