debug

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java

@@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.controller.my.BmsChannelMyController;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
@@ -59,6 +60,7 @@ public class BmsChannelController {
     @GetMapping("/export")
     @PreAuthorize("hasRole('bms:channel:query')")
     public R<List<BmsChannel>> export(BmsChannel param){
+
         LambdaQueryWrapper<BmsChannel> channelWrapper = new LambdaQueryWrapper<>(param);
         channelWrapper.orderByDesc(BmsChannel::getCreateTime);
         if(param.getSelectStartTime()!=null) {
@@ -149,6 +151,7 @@ public class BmsChannelController {
     @SysLog(module = SystemModule.BASE, title = "渠道", biz = BizType.INSERT)
     @PreAuthorize("hasRole('bms:channel:insert')")
     public R<?> save(@RequestBody @Valid BmsChannel param){
+        param.setChannelCode("D"+ StringUtils.genShortId());
         boolean result = bmsChannelService.save(param);
         return R.isTrue(result);
     }

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@@ -63,6 +63,7 @@ public class BmsChannelPointController {
     private BmsMasterUserService bmsMasterUserService;
     private SysPostUserService postUserService;
     private BmsChannelPointMyController bmsChannelPointMyController;
+    private BmsChannelService bmsChannelService;
 
     /**
      * 导出
@@ -86,6 +87,13 @@ public class BmsChannelPointController {
         lqw.isNotNull(BmsChannelPoint::getCreateBy);
         List<BmsChannelPoint> list = bmsChannelPointService.list(lqw);
         for (BmsChannelPoint channelPoint : list) {
+            Long channelId = channelPoint.getChannelId();
+            BmsChannel channel = bmsChannelService.getById(channelId);
+            if(channel!=null){
+                channelPoint.setChannelName(channel.getChannelName());
+                channelPoint.setChannelCode(channel.getChannelCode());
+                channelPoint.setChannelType(channel.getChannelType());
+            }
             if(StringUtils.hasText(channelPoint.getBizRegionPath())){
                 String[] bizRegions = channelPoint.getBizRegionPath().split("_");
                 if(bizRegions.length>0){

src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java

@@ -30,8 +30,6 @@ public class BmsChannel implements Serializable {
     private Long id;
 
     /** 渠道编码 */
-    @NotBlank(message = "渠道编码不能为空")
-    @Length(max = 50,message = "渠道编码长度不能超过50字")
     @TableField(condition = SqlCondition.LIKE)
     private String channelCode;
 

src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java

@@ -201,5 +201,10 @@ public class BmsChannelPoint implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime selectEndTime;
 
+    @TableField(exist = false)
+    private String channelType;
+
+    @TableField(exist = false)
+    private String channelCode;
 }
 

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java

@@ -26,10 +26,6 @@ public class BmsChannelPointBo {
     @NotNull(message = "渠道名称不能为空")
     private Long channelId;
 
-    /** 站点编码 */
-    @NotBlank(message = "站点编码不能为空")
-    @Length(max = 50,message = "站点编码长度不能超过50字")
-    private String pointCode;
 
     /** 站点名称 */
     @NotBlank(message = "站点名称不能为空")

src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@@ -7,6 +7,7 @@ import com.qs.serve.common.model.dto.RowParam;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo;
@@ -77,6 +78,7 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
             }
         }
         if(channelPoint.getId()==null){
+            channelPoint.setPointCode("D"+StringUtils.genShortId());
             this.save(channelPoint);
             sysBusinessLogService.buildLog4Save(BusinessLogType.Point,channelPoint.getId()+"",channelPoint.getPointCode(),channelPoint.getPointName(),null,channelPoint);
             //添加默认为该网点联系人

src/main/java/com/qs/serve/modules/pay/controller/PayWayController.java

@@ -40,7 +40,6 @@ public class PayWayController {
     @GetMapping("/list")
     public R<List<PayWay>> getList(PayWay param){
         LambdaQueryWrapper<PayWay> lqw = new LambdaQueryWrapper<>(param);
-        PageUtil.startPage();
         List<PayWay> list = payWayService.list(lqw);
         return R.ok(list);
     }