From 7176fe803fb4404c05a5b5286924572c2c5712a1 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 20 Mar 2024 08:58:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=A7=BB=E9=99=A4=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0=EF=BC=9B?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BC=9F=E6=88=90sku=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 2 +- .../goods/controller/GoodsSkuController.java | 14 ++++++++ .../goods/controller/GoodsSpuController.java | 2 ++ .../serve/modules/goods/entity/GoodsSku.java | 1 - .../modules/goods/entity/bo/GoodsSkuBo.java | 11 ++++++ .../service/impl/GoodsSkuServiceImpl.java | 36 +++++++++++-------- .../service/impl/GoodsSpuServiceImpl.java | 2 +- .../oms/service/impl/OmsOrderServiceImpl.java | 17 +++++---- .../controller/TbsCostApplyController.java | 2 +- .../service/impl/TbsActivityServiceImpl.java | 5 +++ .../third/entity/ThirtyVerification.java | 1 + .../service/PortalOfCostApplication.java | 2 +- .../third/util/ThirtyVerificationUtil.java | 17 ++++----- .../controller/VtbVerificationController.java | 8 +++-- .../impl/VtbVerificationServiceImpl.java | 6 ++-- 15 files changed, 84 insertions(+), 42 deletions(-) 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 853f63e9..dcf9f105 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 @@ -495,7 +495,7 @@ public class BmsSupplierController { userIds = Arrays.asList(supplier.getOtherUserIds()); } Set otherUserIdSet = new HashSet<>(userIds); - if(supplier.getUserId()==null){ + if(StringUtils.hasText(supplier.getUserId())){ otherUserIdSet.add(supplier.getUserId()); } if(otherUserIdSet.size()<1){ 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 8250e150..4a5ead1f 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 @@ -225,6 +225,20 @@ public class GoodsSkuController { return R.ok(result); } + /** + * 通过skuCode对基本信息更新 + * @param param + * @return + */ + @PostMapping("/updateBySkuCode") + public R updateBySkuCode(GoodsSku param){ + param.setId(null); + param.setSpuId(null); + GoodsSku sku = goodsSkuService.getByCode(param.getSkuCode()); + param.setId(sku.getId()); + goodsSkuService.updateById(param); + return R.ok(); + } /** * 导入 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 4f9c5449..635b9017 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 @@ -65,6 +65,8 @@ public class GoodsSpuController { private SeeYonRequestBaseService seeYonRequestBaseService; private ErpDispatchDataMapper dispatchDataMapper; + + /** * 翻页搜索 * @param param diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 802700bb..012a0c1a 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -97,7 +97,6 @@ public class GoodsSku implements Serializable { private Long unitId; /** 单位 */ - @Length(max = 20,message = "单位长度不能超过20字") private String unitName; /** 版本号 */ diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java index 0be44e2a..136be25d 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java @@ -30,6 +30,8 @@ public class GoodsSkuBo implements Serializable { /** sku编码 */ private String skuCode; + private String skuAddCode; + private String skuName; /** 商品Id */ @@ -97,5 +99,14 @@ public class GoodsSkuBo implements Serializable { /** 线下下单 */ private Integer orderOfflineFlag; + /** 净重 */ + private BigDecimal invUnitWeight; + + /** 单位id */ + private Long unitId; + + /** 单位 */ + private String unitName; + } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java index ef5a2c42..7e7d08f6 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java @@ -236,6 +236,9 @@ public class GoodsSkuServiceImpl extends ServiceImpl im if(dbGoodSku==null){ Assert.throwEx("数据不存在"); } + }else { + //支持通过code更新 + dbGoodSku = this.getByCode(goodSkuVo.getSkuCode()); } if(goodSkuVo.getOrderFlag()==1){ LambdaQueryWrapper skuCheckLqw = new LambdaQueryWrapper<>(); @@ -251,7 +254,6 @@ public class GoodsSkuServiceImpl extends ServiceImpl im } } - GoodsSku goodsSku = CopierUtil.copy(goodSkuVo,new GoodsSku()); if(dbGoodSku!=null){ if(goodsSku.getSpuId()!=null&&!goodsSku.getSpuId().equals(dbGoodSku.getSpuId())){ @@ -264,6 +266,8 @@ public class GoodsSkuServiceImpl extends ServiceImpl im String specInfos = goodsSku.getBelong().trim()+";"+goodsSku.getTasteVal().trim()+";"+goodsSku.getWrapVal().trim(); LambdaQueryWrapper checkSkuSpec = new LambdaQueryWrapper<>(); checkSkuSpec.eq(GoodsSku::getSpuId,goodsSku.getId()); + //拓展支持临时的SPU + checkSkuSpec.ne(GoodsSku::getSpuId,0); checkSkuSpec.eq(GoodsSku::getSpecInfos,specInfos); if(goodsSku.getId()!=null){ checkSkuSpec.ne(GoodsSku::getId,goodsSku.getId()); @@ -278,21 +282,23 @@ public class GoodsSkuServiceImpl extends ServiceImpl im this.saveOrUpdate(goodsSku); //更新特殊标识 - LambdaQueryWrapper specialSkuLqw = new LambdaQueryWrapper<>(); - specialSkuLqw.eq(GoodsSku::getSpecialFlag,1); - specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId()); - List specialSkuList = super.list(specialSkuLqw); - if(specialSkuList.size()>0){ - GoodsSku goodsSku1 = specialSkuList.get(0); - GoodsSpuMapper spuMapper = SpringUtils.getBean(GoodsSpuMapper.class); - GoodsSpu spu = new GoodsSpu(); - spu.setId(goodsSku1.getSpuId()); - if(goodSkuVo.getSpecialFlag().equals(1)){ - spu.setSpecialSkuId(goodsSku1.getId()); - }else { - spu.setSpecialSkuId(0L); + if(!goodsSku.getSpuId().equals(0L)){ + LambdaQueryWrapper specialSkuLqw = new LambdaQueryWrapper<>(); + specialSkuLqw.eq(GoodsSku::getSpecialFlag,1); + specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId()); + List specialSkuList = super.list(specialSkuLqw); + if(specialSkuList.size()>0){ + GoodsSku goodsSku1 = specialSkuList.get(0); + GoodsSpuMapper spuMapper = SpringUtils.getBean(GoodsSpuMapper.class); + GoodsSpu spu = new GoodsSpu(); + spu.setId(goodsSku1.getSpuId()); + if(goodSkuVo.getSpecialFlag().equals(1)){ + spu.setSpecialSkuId(goodsSku1.getId()); + }else { + spu.setSpecialSkuId(0L); + } + spuMapper.updateById(spu); } - spuMapper.updateById(spu); } } } diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java index 63986281..24fd15f7 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java @@ -294,7 +294,7 @@ public class GoodsSpuServiceImpl extends ServiceImpl im @Override public void updateOnlineOfflineFlat(Long spuId) { - if(spuId==null){ + if(spuId==null||spuId.equals(0L)){ return; } GoodsSkuMapper skuMapper = (GoodsSkuMapper) goodsSkuService.getBaseMapper(); diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index 221b6414..da8bbe39 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -176,22 +176,21 @@ public class OmsOrderServiceImpl extends ServiceImpl im shoppingCart.setSpuCode(goodsSpu.getSpuCode()); int qty = 1; for (OmsOrderSkuBo.SpuParam spuParam : confirmOrder.getSpuParamList()) { - if(spuParam.getSpuId().equals(goodsSpu.getId())){ + if(spuParam.getSkuId()!=null&&goodsSku.getId().equals(spuParam.getSkuId())){ if(spuParam.getQty()!=null){ qty = spuParam.getQty(); } shoppingCart.setVolume(spuParam.getVolume()); shoppingCart.setWeight(spuParam.getWeight()); shoppingCart.setRemark(spuParam.getRemark()); + break; } } shoppingCart.setQuantity(qty); - if(goodsSku!=null){ - shoppingCart.setSkuId(goodsSku.getId()); - shoppingCart.setSkuCode(goodsSku.getSkuCode()); - shoppingCart.setSpecInfo(goodsSku.getSpecInfos()); - shoppingCart.setAddPrice(goodsSku.getSalesPrice()); - } + shoppingCart.setSkuId(goodsSku.getId()); + shoppingCart.setSkuCode(goodsSku.getSkuCode()); + shoppingCart.setSpecInfo(goodsSku.getSpecInfos()); + shoppingCart.setAddPrice(goodsSku.getSalesPrice()); shoppingCartList.add(shoppingCart); } @@ -653,8 +652,8 @@ public class OmsOrderServiceImpl extends ServiceImpl im xltOrder.setShouHuoDiZhi(supplierAddress.getDetail()); xltOrder.setRenYuanBianHao(omsOrder.getUserCode()); String remark = sysUser.getName()+"("+sysUser.getMobile()+")"+omsOrder.getRemark()+supplierAddress.getDetail(); - if(remark.length()>70){ - remark = remark.substring(0,70); + if(remark.length()>120){ + remark = remark.substring(0,120); } xltOrder.setZhuYiShiXian(remark); xltOrder.setXieRuShiJian(nowTime); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 7df1e293..45668b6c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -121,7 +121,7 @@ public class TbsCostApplyController { * @param id * @return */ - @PostMapping("/removeCostById/{id}") + @DeleteMapping("/removeCostById/{id}") public R removeCostById(@PathVariable("id") Long id){ tbsCostApplyService.removeCostById(id); return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index e7b84ae8..3d2357c7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -384,6 +384,11 @@ public class TbsActivityServiceImpl extends ServiceImpl toPayDev(){ Long[] ids = new Long[]{ - + 10480363L, + 10480364L, + 10480365L, + 10480366L, + 10480367L }; for (Long id : ids) { vtbVerificationService.toPayRequest(id); 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 b1775987..75d5de44 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 @@ -299,7 +299,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl