From 0d4241890d07e3a266132f190aa76bc7ab838e68 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 3 Jun 2024 14:16:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Abir=E5=85=BC=E5=AE=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E5=AE=A2=E6=88=B7=E7=A9=BA=E5=BC=82=E5=B8=B8=20opt:?= =?UTF-8?q?=20=E7=94=B3=E8=AF=B7=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=A7=91=E7=9B=AE=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A1=8C=E9=94=80=E8=B4=B9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BirActivityCenterGoodsController.java | 18 +++++----- .../BirActivityCenterGoodsServiceImpl.java | 25 ++++++++------ .../impl/BirBaseActivityServiceImpl.java | 3 ++ .../bms/controller/BmsSubjectController.java | 34 +++++++++++++------ .../goods/controller/GoodsSpuController.java | 16 +++++++++ .../service/impl/PayPaymentServiceImpl.java | 2 +- .../mapper/bms/BmsSupplierMapper.xml | 2 +- 7 files changed, 69 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index 167e2554..47a0ebb9 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -155,12 +155,12 @@ public class BirActivityCenterGoodsController { public R syncBir(Integer idType){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw - .select(TbsCostApply::getId).ne(TbsCostApply::getChargeState,0) - .eq(TbsCostApply::getCancelFlag,0) - .gt(TbsCostApply::getTotalActivity,0) - .ne(TbsCostApply::getTmpState,11) - .le(TbsCostApply::getCreateTime, LocalDate.of(2024,1,1).atStartOfDay()) - .ge(TbsCostApply::getCreateTime, LocalDate.of(2024,2,1).atStartOfDay()) ; + .select(TbsCostApply::getId).in(TbsCostApply::getChargeState,1,2,3,7) + //.eq(TbsCostApply::getCancelFlag,0) + //.ne(TbsCostApply::getTotalActivity,0) + .ne(TbsCostApply::getTmpState,20) + .ge(TbsCostApply::getCreateTime, LocalDate.of(2023,9,1).atStartOfDay()) + .le(TbsCostApply::getCreateTime, LocalDate.of(2024,1,1).atStartOfDay()) ; boolean ex = extracted(lqw); while (!ex){ ex = extracted(lqw); @@ -173,11 +173,13 @@ public class BirActivityCenterGoodsController { if(CollectionUtil.isEmpty(costIds)){ return true; } - for (Long costId : costIds) { + for (int i = 0; i < costIds.size(); i++) { + Long costId = costIds.get(i); centerGoodsService.rebuildBir(Arrays.asList(costId)); tbsCostApplyService.update(new LambdaUpdateWrapper() .eq(TbsCostApply::getId,costId) - .set(TbsCostApply::getTmpState,11)); + .set(TbsCostApply::getTmpState,20)); + log.info("{}/{} {}",i,costIds.size(),costId); } return costIds.size()<100; } 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 a983ece0..b51d4b3d 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 @@ -139,19 +139,22 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl supplierLqw = new LambdaQueryWrapper<>(); - supplierLqw.in(BmsSupplier::getId,activityCenterGoodsAllList.stream().map(a->a.getSupplierId()).distinct().collect(Collectors.toList())); + supplierLqw.in(BmsSupplier::getCode,activityCenterGoodsAllList.stream().map(TbsActivityCenterGoods::getSupplierCode).distinct().collect(Collectors.toList())); List bmsSupplierList = bmsSupplierMapper.selectList(supplierLqw); Map supplierMap = bmsSupplierList.stream().collect(Collectors.toMap(BmsSupplier::getId,a->a)); - LambdaQueryWrapper regionLqw = new LambdaQueryWrapper<>(); - regionLqw.in(BmsRegion::getId,bmsSupplierList.stream().map(a->a.getRegionLast()).collect(Collectors.toList())); - List saleRegionList = regionMapper.selectList(regionLqw); - Map saleRegionMap = saleRegionList.stream().collect(Collectors.toMap(BmsRegion::getId,a->a)); - - LambdaQueryWrapper region2Lqw = new LambdaQueryWrapper<>(); - region2Lqw.in(BmsRegion2::getId,bmsSupplierList.stream().map(a->a.getRegion2Last()).collect(Collectors.toList())); - List bizRegionList = region2Mapper.selectList(region2Lqw); - Map bizRegionMap = bizRegionList.stream().collect(Collectors.toMap(BmsRegion2::getId,a->a)); + Map saleRegionMap = null; + Map bizRegionMap = null; + if(CollUtil.isNotEmpty(bmsSupplierList)) { + LambdaQueryWrapper regionLqw = new LambdaQueryWrapper<>(); + regionLqw.in(BmsRegion::getId,bmsSupplierList.stream().map(BmsSupplier::getRegionLast).collect(Collectors.toList())); + List saleRegionList = regionMapper.selectList(regionLqw); + saleRegionMap = saleRegionList.stream().collect(Collectors.toMap(BmsRegion::getId, a->a)); + LambdaQueryWrapper region2Lqw = new LambdaQueryWrapper<>(); + region2Lqw.in(BmsRegion2::getId,bmsSupplierList.stream().map(BmsSupplier::getRegion2Last).collect(Collectors.toList())); + List bizRegionList = region2Mapper.selectList(region2Lqw); + bizRegionMap = bizRegionList.stream().collect(Collectors.toMap(BmsRegion2::getId, a->a)); + } //过滤无效的费用申请 LambdaQueryWrapper costLqw = new LambdaQueryWrapper<>(); @@ -225,8 +228,10 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl0){ + LocalDateTime nowTime = LocalDateTime.now(); for (BirActivityCenterGoods bir : bacgList) { bir.setId(IdUtil.getSnowflakeNextId()); + bir.setUpdateTime(nowTime); super.getBaseMapper().insert(bir); } } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index a331a087..ca94df19 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java @@ -24,6 +24,7 @@ import com.qs.serve.modules.bir.mapper.BirBaseActivityMapper; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.Period; import java.util.ArrayList; import java.util.List; @@ -176,8 +177,10 @@ public class BirBaseActivityServiceImpl extends ServiceImpl subjectIds2 = subjectRegionList.stream().map(a->a.getSubjectId().toString()) .distinct().collect(Collectors.toList()); subjectIds.addAll(subjectIds2); - recursionToSetSelectAble(treeVoList, subjectIds); + recursionToSetSelectAble(treeVoList, subjectIds,null); } } @@ -123,30 +123,42 @@ public class BmsSubjectController { findParentVoAndAddToList(treeVoList,newTreeVoList,pVo); } } + /** * 递归设置可选 * @param treeVoList * @param subjectIds + * @param parentNode */ - private void recursionToSetSelectAble(List treeVoList, List subjectIds) { + private void recursionToSetSelectAble(List treeVoList, List subjectIds,BmsSubjectTreeVo parentNode) { if(CollectionUtil.isEmpty(treeVoList)){ return; } for (Object object : treeVoList) { BmsSubjectTreeVo subjectTreeVo = (BmsSubjectTreeVo)object; - if(CollectionUtil.isEmpty(subjectTreeVo.getChildren())){ - if(subjectTreeVo.getBizRegionFlag().equals(0)||subjectTreeVo.getSaleRegionFlag().equals(0)){ - subjectTreeVo.setApiSelectAble(1); - }else { - for (String subjectId : subjectIds) { - if(subjectTreeVo.getId().equals(subjectId)){ + if(subjectTreeVo.getPid().equals(0L)){ + for (String subjectId : subjectIds) { + if(subjectTreeVo.getId().equals(subjectId)){ + subjectTreeVo.setApiSelectAble(1); + break; + } + } + parentNode = subjectTreeVo; + }else { + if(parentNode.getApiSelectAble().equals(1)){ + if(subjectTreeVo.getBizRegionFlag().equals(0)||subjectTreeVo.getSaleRegionFlag().equals(0)){ + if(!parentNode.getApiSelectAble().equals(0)){ subjectTreeVo.setApiSelectAble(1); - break; } } } - }else { - recursionToSetSelectAble(subjectTreeVo.getChildren(),subjectIds); + } + if(CollectionUtil.isNotEmpty(subjectTreeVo.getChildren())){ + if(parentNode.getApiSelectAble().equals(0)){ + recursionToSetSelectAble(subjectTreeVo.getChildren(),subjectIds,subjectTreeVo); + }else { + recursionToSetSelectAble(subjectTreeVo.getChildren(),subjectIds,subjectTreeVo); + } } } } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 7db95307..d3021a5c 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.goods.controller; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; @@ -123,6 +124,21 @@ public class GoodsSpuController { return R.ok(result); } + + /** + * 更新spu下单状态 + * @param spuCode + * @param state + * @return + */ + @PutMapping("/orderState/{spuCode}/{state}") + public R updateOrderState(@PathVariable("spuCode")String spuCode, + @PathVariable("state") Integer state){ + boolean ok = goodsSpuService.update(new LambdaUpdateWrapper() + .eq(GoodsSpu::getSpuCode,spuCode).set(GoodsSpu::getOrderFlag,state)); + return R.isTrue(ok); + } + /** * spu下单查询 * @param param diff --git a/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java b/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java index bdd18f91..35aa9419 100644 --- a/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java @@ -135,7 +135,7 @@ public class PayPaymentServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayPaymentItem::getVerificationId,vtb.getId()); List payPaymentItemList = paymentItemService.list(lambdaQueryWrapper); - BigDecimal usedAmount = payPaymentItemList.stream().map(a->a.getItemPayAmount()).reduce(BigDecimal.ZERO,BigDecimal::add); + BigDecimal usedAmount = payPaymentItemList.stream().map(PayPaymentItem::getItemPayAmount).reduce(BigDecimal.ZERO,BigDecimal::add); if(usedAmount==null){ usedAmount = BigDecimal.ZERO; } diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index 8a458171..9032e892 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -92,7 +92,6 @@ and `bms_supplier`.`region_first` = #{query.regionFirst} and `bms_supplier`.`region_second` = #{query.regionSecond} and `bms_supplier`.`region_third` = #{query.regionThird} - and `bms_supplier`.`cd_order_flag` = #{query.regionThird} and `bms_supplier`.`supplier_flag` = #{query.supplierFlag} and `bms_supplier`.`address` = #{query.address} and `bms_supplier`.`name` like concat('%',#{query.name},'%') @@ -103,6 +102,7 @@ and `bms_supplier`.`parent_code` = #{query.parentCode} and `bms_supplier`.`stop_flag` = #{query.stopFlag} and `bms_supplier`.`belong` = #{query.belong} + and `bms_supplier`.`cd_order_flag` = #{query.cdOrderFlag} and `bms_supplier`.`create_time` = #{query.createTime} and `bms_supplier`.`create_by` = #{query.createBy} and `bms_supplier`.`update_time` = #{query.updateTime}