From 768baef0e9325b75f0018a9e9f89f4966af1f645 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 5 Dec 2023 11:49:29 +0800 Subject: [PATCH] debug --- .../goods/controller/GoodsSkuController.java | 10 ++++---- .../goods/controller/GoodsSpuController.java | 14 +++++++---- .../goods/entity/vo/GoodsSkuExportVo.java | 5 ++-- .../impl/TbsCostApplyPart1ServiceImpl.java | 5 ++++ .../controller/VtbVerificationController.java | 23 ++++++++++--------- .../service/VtbVerificationApplication.java | 15 ++++++++---- .../impl/VtbVerificationServiceImpl.java | 1 + .../resources/mapper/goods/GoodsSkuMapper.xml | 2 ++ 8 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index a922526e..2bf8c6de 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -224,9 +224,9 @@ public class GoodsSkuController { @PostMapping("/importSku") @SysLog(module = SystemModule.GOODS, title = "import", biz = BizType.INSERT) public R importSpu(@RequestBody @Valid GoodsSkuImportBo param){ - final String UPDATE = "update"; - final String DELETE = "delete"; - final String SAVE = "save"; + final String UPDATE = "2"; + final String DELETE = "3"; + final String SAVE = "1"; Map> skuItemList = param.getSkuList().stream().collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt)); //处理删除 List delList = skuItemList.get(DELETE); @@ -271,8 +271,8 @@ public class GoodsSkuController { } //处理更新和新增 - List skuCodes = param.getSkuList().stream().map(a->a.getSkuCode()).distinct().collect(Collectors.toList()); - List spuCodes = param.getSkuList().stream().map(a->a.getSpuCode()).distinct().collect(Collectors.toList()); + List skuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).distinct().collect(Collectors.toList()); + List spuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSpuCode).distinct().collect(Collectors.toList()); List skuList = goodsSkuService.getByCodes(skuCodes); List spuList = goodsSpuService.getByCodes(spuCodes); for (GoodsSkuImportBo.SkuItem skuItem : param.getSkuList()) { 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 323f9d39..d0f7b18f 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 @@ -327,7 +327,6 @@ public class GoodsSpuController { */ @GetMapping("/export") public R> export(GoodsSpu param){ - PageUtil.startPage(); List list = goodsSpuService.selectSpuList(param); List exportVoList = list.stream().map(a->{ GoodsSpuExportVo vo = new GoodsSpuExportVo(); @@ -352,9 +351,10 @@ public class GoodsSpuController { @PostMapping("/importSpu") @SysLog(module = SystemModule.GOODS, title = "import", biz = BizType.INSERT) public R importSpu(@RequestBody @Valid GoodsSpuImportBo param){ - final String UPDATE = "update"; - final String DELETE = "delete"; - final String SAVE = "save"; + final String UPDATE = "2"; + final String DELETE = "3"; + final String SAVE = "1"; + final String NONE = "4"; //导入 List spuCodes = new ArrayList<>(); @@ -383,6 +383,9 @@ public class GoodsSpuController { boolean isError = false; for (GoodsSpuImportBo.SpuItem item : param.getSpuList()) { + if(item.getOpt().equals(NONE)){ + continue; + } spuCodes.add(item.getSpuCode()); //更新或者保存，需要校验类目名称 if(StringUtils.hasText(item.getCategoryName())&&!item.getOpt().equals(DELETE)){ @@ -438,6 +441,9 @@ public class GoodsSpuController { for (GoodsSpu spu : spuList) { if(spu.getSpuCode().equals(spuItem.getSpuCode())){ + if(spuItem.getOpt().equals(NONE)){ + continue; + } //删除 if(spuItem.getOpt().equals(DELETE)){ rmIds.add(spu.getId()); diff --git a/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSkuExportVo.java b/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSkuExportVo.java index 030b0ba1..33053315 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSkuExportVo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSkuExportVo.java @@ -36,9 +36,8 @@ public class GoodsSkuExportVo implements Serializable { private String skuName; - /** 商品Id */ - @NotNull(message = "商品Id不能为空") - private Long spuId; + /** spu编码 */ + private Long spuCode; /** 销售价格 */ private BigDecimal salesPrice; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index 690ee687..e8eb2c4b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -265,6 +266,8 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { obj.setId(null); obj.setCostApplyId(newCostApplyId); obj.setActivityId(newActivityId); + obj.setUsedAmount(BigDecimal.ZERO); + }); tbsActivityCenterService.saveBatch(centerList); @@ -273,6 +276,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { obj.setId(null); obj.setCostApplyId(newCostApplyId); obj.setActivityId(newActivityId); + obj.setUsedAmount(BigDecimal.ZERO); }); tbsActivitySubjectService.saveBatch(subjectList); @@ -281,6 +285,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { obj.setId(null); obj.setCostApplyId(newCostApplyId); obj.setActivityId(newActivityId); + obj.setUsedAmount(BigDecimal.ZERO); }); tbsActivityCenterGoodsService.saveBatch(centerGoodsList); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 45218877..5384d63b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -214,8 +214,6 @@ public class VtbVerificationController { List subjectCenterList = vtbVerificationSubjectCenterService.listByVerificationId(Long.parseLong(id)); List activitySubjects = activitySubjectService.listByActivityId(vtbVerification.getActivityId()); List activityCenters = activityCenterService.listByActivity(vtbVerification.getActivityId()); - List activityCenterGoodsList = activityCenterGoodsService.listByActivityId(vtbVerification.getActivityId()); - Map> centerGoodsGroupBySubjectId = activityCenterGoodsList.stream().collect(Collectors.groupingBy(TbsActivityCenterGoods::getSubjectId)); for (VtbVerificationSubject verificationSubject : subjectList) { for (TbsActivitySubject activitySubject : activitySubjects) { if(verificationSubject.getSubjectId().equals(activitySubject.getSubjectId())){ @@ -229,8 +227,7 @@ public class VtbVerificationController { if(subjectCenterList.size()<1){ //subjectCenterList为空，代表是旧的审批，需要兼容 for (VtbVerificationSubject verificationSubject : subjectList) { - List activityCenterGoods = centerGoodsGroupBySubjectId.get(verificationSubject.getSubjectId()); - for (TbsActivityCenterGoods centerGood : activityCenterGoods) { + for (TbsActivityCenter activityCenter : activityCenters) { BigDecimal userAmountRecord = verificationSubject.getUsedAmountRecord(); BigDecimal useAmount = verificationSubject.getUsedAmount(); VtbVerificationSubjectCenter verCenter = new VtbVerificationSubjectCenter(); @@ -242,15 +239,19 @@ public class VtbVerificationController { verCenter.setSupplierId(verificationSubject.getSupplierId()); verCenter.setSupplierCode(verificationSubject.getSupplierCode()); verCenter.setSupplierName(verificationSubject.getSupplierName()); - BigDecimal usedItemRecord = userAmountRecord.multiply(centerGood.getCenterGoodsRate()).divide(new BigDecimal("100"),2, RoundingMode.DOWN); - BigDecimal usedItem = useAmount.multiply(centerGood.getCenterGoodsRate()).divide(new BigDecimal("100"),2, RoundingMode.DOWN); + BigDecimal usedItemRecord = userAmountRecord + .multiply(activityCenter.getCenterRate()) + .divide(new BigDecimal("100"),2, RoundingMode.DOWN); + BigDecimal usedItem = useAmount + .multiply(activityCenter.getCenterRate()) + .divide(new BigDecimal("100"),2, RoundingMode.DOWN); verCenter.setUsedAmount(usedItem); verCenter.setUsedAmountRecord(usedItemRecord); - verCenter.setCenterType(centerGood.getCenterType()); - verCenter.setCenterId(centerGood.getCenterId()); - verCenter.setCenterCode(centerGood.getCenterCode()); - verCenter.setCenterName(centerGood.getCenterName()); - verCenter.setActivityCenterId(centerGood.getId()); + verCenter.setCenterType(activityCenter.getCenterType()); + verCenter.setCenterId(activityCenter.getCenterId()); + verCenter.setCenterCode(activityCenter.getCenterCode()); + verCenter.setCenterName(activityCenter.getCenterName()); + verCenter.setActivityCenterId(activityCenter.getId()); subjectCenterList.add(verCenter); } } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index a7d65424..fa409e23 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -89,16 +89,21 @@ public class VtbVerificationApplication { } if(result.getStatus()==200){ // 判断是否含有下个节点 - //String flag = result.getData(); try { Thread.sleep(3000); } catch (InterruptedException e) { e.printStackTrace(); } - VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); - String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); - if(devFlag){ - summeryResult = "finished"; + String summeryResult = result.getData(); + if(!result.getData().equals("stop")){ + VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); + summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); + if(devFlag){ + summeryResult = "finished"; + return R.ok(); + } + }else { + summeryResult = "refuse"; } R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult); try { 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 7b6bd34b..e7e9d7da 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 @@ -1273,6 +1273,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectCenterLqw = new LambdaQueryWrapper<>(); subjectCenterLqw.eq(VtbVerificationSubjectCenter::getVerificationId,verificationId); VtbVerificationSubjectCenter centerUpdParam = new VtbVerificationSubjectCenter(); + centerUpdParam.setVerificationId(verificationId); centerUpdParam.setEffectiveFlag(1); vtbVerificationSubjectCenterService.update(centerUpdParam,subjectCenterLqw); //更新活动状态 diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index 20eb58ef..9efeb46b 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -47,6 +47,8 @@ goods_sku.`unit_name`, goods_sku.`weight`, goods_sku.`volume`, + goods_sku.`wrap_val`, + goods_sku.`taste_val`, goods_sku.`min_purchase`, goods_sku.`enable`, goods_sku.`version`,