debug

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

@@ -6,6 +6,7 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 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.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.controller.my.BmsChannelMyController;
@@ -49,6 +50,30 @@ public class BmsChannelController {
     private BmsMasterUserMapper bmsMasterUserMapper;
     private BmsSupplierChannelService bmsSupplierChannelService;
     private BmsChannelMyController bmsChannelMyController;
+
+    /**
+     * 导出列表
+     * @param param
+     * @return
+     */
+    @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) {
+            channelWrapper.ge(BmsChannel::getCreateTime, param.getSelectStartTime());
+        }
+        if(param.getSelectEndTime()!=null) {
+            channelWrapper.le(BmsChannel::getCreateTime, param.getSelectEndTime());
+        }
+        if(CollectionUtil.isNotEmpty(param.getSelectIds())){
+            channelWrapper.in(BmsChannel::getId, param.getSelectIds());
+        }
+        List<BmsChannel> list = bmsChannelService.list(channelWrapper);
+        return R.ok(list);
+    }
+
     /**
      * 翻页
      * @param param

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

@@ -8,10 +8,7 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.dto.RowParam;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.baz.common.BazTargetTypeConsts;
 import com.qs.serve.modules.baz.entity.BazVisitInfo;
 import com.qs.serve.modules.baz.service.BazVisitInfoService;
@@ -67,6 +64,43 @@ public class BmsChannelPointController {
     private SysPostUserService postUserService;
     private BmsChannelPointMyController bmsChannelPointMyController;
 
+    /**
+     * 导出
+     * @param param
+     * @return
+     */
+    @GetMapping("/export")
+    @PreAuthorize("hasRole('bms:channelPoint:query')")
+    public R<List<BmsChannelPoint>> export(BmsChannelPoint param){
+        LambdaQueryWrapper<BmsChannelPoint> lqw = new LambdaQueryWrapper<>(param);
+        lqw.orderByDesc(BmsChannelPoint::getCreateTime);
+        if(param.getSelectStartTime()!=null) {
+            lqw.ge(BmsChannelPoint::getCreateTime, param.getSelectStartTime());
+        }
+        if(param.getSelectEndTime()!=null) {
+            lqw.le(BmsChannelPoint::getCreateTime, param.getSelectEndTime());
+        }
+        if(CollectionUtil.isNotEmpty(param.getSelectIds())){
+            lqw.in(BmsChannelPoint::getId, param.getSelectIds());
+        }
+        List<BmsChannelPoint> list = bmsChannelPointService.list(lqw);
+        for (BmsChannelPoint channelPoint : list) {
+            if(StringUtils.hasText(channelPoint.getBizRegionPath())){
+                String[] bizRegions = channelPoint.getBizRegionPath().split("_");
+                if(bizRegions.length>0){
+                    channelPoint.setBizRegionName(bizRegions[bizRegions.length-1]);
+                }
+            }
+            if(StringUtils.hasText(channelPoint.getSaleRegionPath())){
+                String[] regions = channelPoint.getSaleRegionPath().split("_");
+                if(regions.length>0){
+                    channelPoint.setSaleRegionName(regions[regions.length-1]);
+                }
+            }
+        }
+        return R.ok(list);
+    }
+
     /**
      * 获取我负责的网点
      * @param param
@@ -77,8 +111,11 @@ public class BmsChannelPointController {
         String sysUserId = AuthContextUtils.getSysUserId();
         List<String> userIds = postUserService.listByChildIds(sysUserId);
         userIds.add(sysUserId);
-        List<BmsUserPoint4VisitVo> list = channelPointMapper.selectUserPointList4Visit(param, userIds,new RowParam(true));
         Long count = channelPointMapper.selectCountUserPointList4Visit(param,userIds);
+        if(count<1){
+            return R.byEmptyList();
+        }
+        List<BmsUserPoint4VisitVo> list = channelPointMapper.selectUserPointList4Visit(param, userIds,new RowParam(true));
         for (BmsUserPoint4VisitVo visitVo : list) {
             LambdaQueryWrapper<BazVisitInfo> visitInfoLqw = new LambdaQueryWrapper<>();
             visitInfoLqw.eq(BazVisitInfo::getTargetType, BazTargetTypeConsts.POINT);

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

@@ -117,6 +117,9 @@ public class BmsSupplierController {
             PageHelper.startPage(param.getPageNum(),param.getPageSize());
             List<HisUserSupplier> list = hisUserSupplierService.list(lqw);
             List<Long> supplierIds = list.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
+            if(CollectionUtil.isNotEmpty(supplierIds)){
+                return R.byEmptyList();
+            }
             List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
             return R.byPageHelperList(list,supplierList);
         }

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

@@ -13,7 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
-
+import java.util.List;
 /**
  * 渠道 实体类
  * @author YenHex
@@ -86,5 +86,21 @@ public class BmsChannel implements Serializable {
     @TableField(exist = false)
     private Integer loadByCurrent;
 
+    /** 选择的渠道ID */
+    @TableField(exist = false)
+    private List<String> selectIds;
+
+    /** 选择的渠道开始时间 */
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime selectStartTime;
+
+    /** 选择的渠道结束时间 */
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime selectEndTime;
+
 }
 

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

@@ -183,5 +183,23 @@ public class BmsChannelPoint implements Serializable {
     /** 值=1，过滤当前用户及下属负责数据 */
     @TableField(exist = false)
     private Integer loadByCurrent;
+
+
+    /** 选择的ID */
+    @TableField(exist = false)
+    private List<String> selectIds;
+
+    /** 选择的开始时间 */
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime selectStartTime;
+
+    /** 选择的结束时间 */
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime selectEndTime;
+
 }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -95,7 +95,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
             Assert.throwEx("状态不支持释放活动费用");
         }
-        BigDecimal releaseAmount = validActivity(activity,false,false);
+        BigDecimal releaseAmount = validActivity(costApply.getContractFlag().equals(1),activity,false,false);
         TbsActivity param = new TbsActivity();
         param.setId(activityId);
         param.setActivityState(TbsActivityState.STATE_4_Release);
@@ -201,7 +201,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             Assert.throwEx("当前费用状态不支持");
         }
         //协议类申请
-        if(costApply.getContractFlag().equals(1)){
+        boolean cotractFlag = costApply.getContractFlag().equals(1);
+        if(cotractFlag){
             if(verificationBo.getPayConditionId()==null){
                 Assert.throwEx("请选择支付条件");
             }
@@ -218,20 +219,23 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             vtbVerificationLqw.eq(VtbVerification::getPayConditionId,verificationBo.getPayConditionId());
             vtbVerificationLqw.eq(VtbVerification::getVerificationState,VtbVerificationState.Finished.getCode());
             List<VtbVerification> vtbVerificationList = this.list(vtbVerificationLqw);
-            BigDecimal totalCheck = BigDecimal.ZERO;
+            if(vtbVerificationList.size()>0){
-            for (VtbVerification verification : vtbVerificationList) {
+                Assert.throwEx("支付条件已核销");
-                totalCheck = totalCheck.add(verification.getAmount());
-            }
-            BigDecimal totalCheckPl = payCondition.getPaymentPrice().subtract(totalCheck);
-            if(totalCheckPl.compareTo(totalSubjectAmt)>1){
-                Assert.throwEx("核销金额超过支付条件金额，剩余金额："+totalCheckPl.doubleValue());
             }
+//            BigDecimal totalCheck = BigDecimal.ZERO;
+//            for (VtbVerification verification : vtbVerificationList) {
+//                totalCheck = totalCheck.add(verification.getAmount());
+//            }
+//            BigDecimal totalCheckPl = payCondition.getPaymentPrice().subtract(totalCheck);
+//            if(totalCheckPl.compareTo(totalSubjectAmt)>1){
+//                Assert.throwEx("核销金额超过支付条件金额，剩余金额："+totalCheckPl.doubleValue());
+//            }
             payCondition.setFinishedFlag(2);
             activityPayConditionService.updateById(payCondition);
         }
         //退回的审批跳过校验
         boolean isCurrentCommit = verificationBo.getId()!=null;
-        validActivity(activity,true,isCurrentCommit);
+        validActivity(cotractFlag,activity,true,isCurrentCommit);
         VtbVerification verification = new VtbVerification();
         verification.setId(verificationBo.getId());
         verification.setPayConditionId(verificationBo.getPayConditionId());
@@ -392,11 +396,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
      * @param isCurrentCommit 是否当前活动占用提交
      * @return
      */
-    private BigDecimal validActivity(TbsActivity activity,boolean filterActTime,boolean isCurrentCommit){
+    private BigDecimal validActivity(boolean cotractFlag,TbsActivity activity,boolean filterActTime,boolean isCurrentCommit){
         LocalDate nowDate = LocalDate.now();
-        if(activity.getReopenFlag().equals(0)
+        if(!cotractFlag && activity.getReopenFlag().equals(0)
                 && filterActTime
-
                 //&& nowDate.isAfter(activity.getActEndDate())
                 && nowDate.isAfter(activity.getPreCheckDate())){
             Assert.throwEx("活动已结束");