From 69b99609542e75546321a3332b1ce419a2cec71d Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 8 Dec 2023 10:33:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF=E7=9A=84Bi?= =?UTF-8?q?r;=E7=BD=91=E7=82=B9=E5=AF=BC=E5=87=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9B=E7=BD=91=E7=82=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/mapper/BirBaseActivityMapper.java | 6 +++++ .../BirActivityCenterGoodsServiceImpl.java | 4 +++ .../controller/BmsChannelPointController.java | 25 ++++++++++--------- .../modules/tbs/entity/TbsCostApply.java | 3 +++ .../service/PortalOfCostApplication.java | 5 +--- .../mapper/bir/BirBaseActivityMapper.xml | 7 ++++++ 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java index c8c5575b..21d3f65a 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java @@ -17,5 +17,11 @@ public interface BirBaseActivityMapper extends BaseMapper { List selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate); + /** + * 作废的异常的 + * @return + */ + void deleteErrorBir(); + } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index d4217169..db057057 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -12,6 +12,7 @@ import com.qs.serve.modules.bir.entity.BirRemoveId; import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO; import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo; import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo; +import com.qs.serve.modules.bir.mapper.BirBaseActivityMapper; import com.qs.serve.modules.bir.mapper.BirRemoveIdMapper; import com.qs.serve.modules.bms.entity.BmsCostCenter; import com.qs.serve.modules.bms.entity.BmsRegion; @@ -73,6 +74,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null); //异常状态的费用申请，导致的Bir + birBaseActivityMapper.deleteErrorBir(); List removeErrorBirList = this.baseMapper.selectErrorBir(); List errorActIds = removeErrorBirList.stream().map(BirActivityCenterGoods::getActivityId).distinct().collect(Collectors.toList()); this.buildRemoveRecode(errorActIds); 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 2716d6c3..f28d444a 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 @@ -35,10 +35,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -89,7 +86,7 @@ public class BmsChannelPointController { } if(param.getExportNum() != null && param.getExportNum()!= 0 - && param.getStartNum() != null && param.getStartNum()!= 0){ + && param.getStartNum() != null ){ lqw.last(" limit "+param.getStartNum() + "," + param.getExportNum()); } @@ -337,9 +334,9 @@ public class BmsChannelPointController { } }); - List saveList = param.stream().filter(a->a.getType().equals("1")).collect(Collectors.toList()); - List updateList = param.stream().filter(a->a.getType().equals("2")).collect(Collectors.toList()); - List deleteList = param.stream().filter(a->a.getType().equals("3")).collect(Collectors.toList()); + List saveList = param.stream().filter(a-> "1".equals(a.getType())).collect(Collectors.toList()); + List updateList = param.stream().filter(a-> "2".equals(a.getType())).collect(Collectors.toList()); + List deleteList = param.stream().filter(a-> "3".equals(a.getType())).collect(Collectors.toList()); /** ------------------------------- 查渠道列表 ------------------------------------------------ */ List channelCodes = new ArrayList<>(); @@ -363,12 +360,16 @@ public class BmsChannelPointController { }); } } - Map codeToChannaledId = channelList.stream().collect(Collectors.toMap(BmsChannel::getChannelCode, a->a)); + //有重复的key这个方法会报错 + //Map codeToChannaledId = channelList.stream().collect(Collectors.toMap(BmsChannel::getChannelCode, a->a)); + Map codeToChannaledId = channelList.stream() + .filter(a->a.getChannelCode()!=null) + .collect(Collectors.toMap(BmsChannel::getChannelCode, p -> p, (o, n) -> n)); /** ----------------------------------------------------------------------------------- */ /** ------------------------------- 查行政区域列表 ------------------------------------------------ */ List bizRegionCodes = new ArrayList<>(); - bizRegionCodes.addAll(saveList.stream().filter(a->a.getBizRegionCode()!=null).map(a->a.getBizRegionCode()).collect(Collectors.toList())); - bizRegionCodes.addAll(updateList.stream().filter(a->a.getBizRegionCode()!=null).map(a->a.getBizRegionCode()).collect(Collectors.toList())); + bizRegionCodes.addAll(saveList.stream().map(BmsChannelPoint4ExcelBo::getBizRegionCode).filter(Objects::nonNull).collect(Collectors.toList())); + bizRegionCodes.addAll(updateList.stream().map(BmsChannelPoint4ExcelBo::getBizRegionCode).filter(Objects::nonNull).collect(Collectors.toList())); bizRegionCodes = bizRegionCodes.stream().distinct().collect(Collectors.toList()); List region2List = new ArrayList<>(); if(bizRegionCodes.size()>0){ @@ -463,7 +464,7 @@ public class BmsChannelPointController { /** ----------------------------------------------------------------------------------- */ /** ------------------------------- 返回错误 ------------------------------------------- */ - if(param.stream().filter(a->a.getErrorInfo().length()>0).count()>0) { + if(param.stream().filter(a->a.getErrorInfo()!=null&&a.getErrorInfo().length()>0).count()>0) { return R.ok(param, "导入失败，请打开EXCEL查询错误详情！"); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index f057c8e7..4a4b89df 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -178,6 +178,9 @@ public class TbsCostApply implements Serializable { /** 统计所有活动使用的金额 */ private BigDecimal totalActivityUsedAmount; + /** 政策项ID */ + private Long policyItemId; + /** 模板id */ private Long templateId; diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index ecbde498..ecea3a87 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -257,16 +257,12 @@ public class PortalOfCostApplication { List skuList = this.initSkuListOfProcess(invCodes); //常用参数 final String GOODS_TYPE = "sku"; - final String CENTER_TYPE = "customer"; final BigDecimal OneHundred = new BigDecimal("100"); LocalDateTime nowTime = LocalDateTime.now(); LocalDate nowDate = LocalDate.now(); - Date nowDate_ = new Date(); - String erpCode = createBo.getErpCode(); Long supplierId = Long.parseLong(supplier.getId()); BigDecimal totalAmount = createBo.getTotalAmount(); String costTheme = createBo.getCostTheme(); - String random = String.format("%03d",new Random().nextInt(999)); String costApplyCode = "CA"+CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply); String activityCode = costApplyCode + "_1"; String activityTitle = "由政策"+policyItem.getPolicyItemCode()+"核销一站式API生成的活动"; @@ -284,6 +280,7 @@ public class PortalOfCostApplication { costApply.setTotalActivity(1); costApply.setTotalActivityAmount(totalAmount); costApply.setTotalActivityUsedAmount(totalAmount); + costApply.setPolicyItemId(policyItem.getId()); //构建活动 TbsActivity activity = new TbsActivity(); activity.setActivityCode(activityCode); diff --git a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml index b561bc0e..d81bdf45 100644 --- a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml +++ b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml @@ -109,5 +109,12 @@ ) +