diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index 6881591f..edb82ef3 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/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> export(BmsChannel param){ + LambdaQueryWrapper 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 list = bmsChannelService.list(channelWrapper); + return R.ok(list); + } + /** * 翻页 * @param param diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index 295dae72..46614a4d 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/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.CopierUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; 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> export(BmsChannelPoint param){ + LambdaQueryWrapper 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 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 userIds = postUserService.listByChildIds(sysUserId); userIds.add(sysUserId); - List list = channelPointMapper.selectUserPointList4Visit(param, userIds,new RowParam(true)); Long count = channelPointMapper.selectCountUserPointList4Visit(param,userIds); + if(count<1){ + return R.byEmptyList(); + } + List list = channelPointMapper.selectUserPointList4Visit(param, userIds,new RowParam(true)); for (BmsUserPoint4VisitVo visitVo : list) { LambdaQueryWrapper visitInfoLqw = new LambdaQueryWrapper<>(); visitInfoLqw.eq(BazVisitInfo::getTargetType, BazTargetTypeConsts.POINT); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 8eb76b9b..ab775936 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/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 list = hisUserSupplierService.list(lqw); List supplierIds = list.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(supplierIds)){ + return R.byEmptyList(); + } List supplierList = bmsSupplierService.listByIds(supplierIds); return R.byPageHelperList(list,supplierList); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java index ed17f74d..7a673ab7 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java +++ b/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 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; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java index 252e07ba..be568260 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java +++ b/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 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; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 79793e12..1c6736be 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -95,7 +95,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl vtbVerificationList = this.list(vtbVerificationLqw); - 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()); + if(vtbVerificationList.size()>0){ + Assert.throwEx("支付条件已核销"); } +// 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