fix: 修复订单数量移除；修改核销支付参数；对接伟成sku同步接口

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -495,7 +495,7 @@ public class BmsSupplierController {
             userIds = Arrays.asList(supplier.getOtherUserIds());
         }
         Set<String> otherUserIdSet = new HashSet<>(userIds);
-        if(supplier.getUserId()==null){
+        if(StringUtils.hasText(supplier.getUserId())){
             otherUserIdSet.add(supplier.getUserId());
         }
         if(otherUserIdSet.size()<1){

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();
+    }
 
     /**
      * 导入

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

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;
 
     /** 版本号 */

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;
+
 }
 

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@@ -236,6 +236,9 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
             if(dbGoodSku==null){
                 Assert.throwEx("数据不存在");
             }
+        }else {
+            //支持通过code更新
+            dbGoodSku = this.getByCode(goodSkuVo.getSkuCode());
         }
         if(goodSkuVo.getOrderFlag()==1){
             LambdaQueryWrapper<GoodsSku> skuCheckLqw = new LambdaQueryWrapper<>();
@@ -251,7 +254,6 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> 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<GoodsSkuMapper,GoodsSku> im
         String specInfos = goodsSku.getBelong().trim()+";"+goodsSku.getTasteVal().trim()+";"+goodsSku.getWrapVal().trim();
         LambdaQueryWrapper<GoodsSku> 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<GoodsSkuMapper,GoodsSku> im
         this.saveOrUpdate(goodsSku);
 
         //更新特殊标识
-        LambdaQueryWrapper<GoodsSku> specialSkuLqw = new LambdaQueryWrapper<>();
+        if(!goodsSku.getSpuId().equals(0L)){
-        specialSkuLqw.eq(GoodsSku::getSpecialFlag,1);
+            LambdaQueryWrapper<GoodsSku> specialSkuLqw = new LambdaQueryWrapper<>();
-        specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId());
+            specialSkuLqw.eq(GoodsSku::getSpecialFlag,1);
-        List<GoodsSku> specialSkuList = super.list(specialSkuLqw);
+            specialSkuLqw.eq(GoodsSku::getSpuId,goodsSku.getId());
-        if(specialSkuList.size()>0){
+            List<GoodsSku> specialSkuList = super.list(specialSkuLqw);
-            GoodsSku goodsSku1 = specialSkuList.get(0);
+            if(specialSkuList.size()>0){
-            GoodsSpuMapper spuMapper = SpringUtils.getBean(GoodsSpuMapper.class);
+                GoodsSku goodsSku1 = specialSkuList.get(0);
-            GoodsSpu spu = new GoodsSpu();
+                GoodsSpuMapper spuMapper = SpringUtils.getBean(GoodsSpuMapper.class);
-            spu.setId(goodsSku1.getSpuId());
+                GoodsSpu spu = new GoodsSpu();
-            if(goodSkuVo.getSpecialFlag().equals(1)){
+                spu.setId(goodsSku1.getSpuId());
-                spu.setSpecialSkuId(goodsSku1.getId());
+                if(goodSkuVo.getSpecialFlag().equals(1)){
-            }else {
+                    spu.setSpecialSkuId(goodsSku1.getId());
-                spu.setSpecialSkuId(0L);
+                }else {
+                    spu.setSpecialSkuId(0L);
+                }
+                spuMapper.updateById(spu);
             }
-            spuMapper.updateById(spu);
         }
     }
 }

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java

@@ -294,7 +294,7 @@ public class GoodsSpuServiceImpl extends ServiceImpl<GoodsSpuMapper,GoodsSpu> im
 
     @Override
     public void updateOnlineOfflineFlat(Long spuId) {
-        if(spuId==null){
+        if(spuId==null||spuId.equals(0L)){
             return;
         }
         GoodsSkuMapper skuMapper = (GoodsSkuMapper) goodsSkuService.getBaseMapper();

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -176,22 +176,21 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> 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.setSkuId(goodsSku.getId());
+            shoppingCart.setSkuCode(goodsSku.getSkuCode());
-                shoppingCart.setSkuCode(goodsSku.getSkuCode());
+            shoppingCart.setSpecInfo(goodsSku.getSpecInfos());
-                shoppingCart.setSpecInfo(goodsSku.getSpecInfos());
+            shoppingCart.setAddPrice(goodsSku.getSalesPrice());
-                shoppingCart.setAddPrice(goodsSku.getSalesPrice());
-            }
             shoppingCartList.add(shoppingCart);
         }
 
@@ -653,8 +652,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         xltOrder.setShouHuoDiZhi(supplierAddress.getDetail());
         xltOrder.setRenYuanBianHao(omsOrder.getUserCode());
         String remark = sysUser.getName()+"("+sysUser.getMobile()+")"+omsOrder.getRemark()+supplierAddress.getDetail();
-        if(remark.length()>70){
+        if(remark.length()>120){
-            remark = remark.substring(0,70);
+            remark = remark.substring(0,120);
         }
         xltOrder.setZhuYiShiXian(remark);
         xltOrder.setXieRuShiJian(nowTime);

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();

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java

@@ -384,6 +384,11 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                 if(channel==null){
                     Assert.throwEx("渠道["+channelPoint.getChannelCode()+"]不存在或已停用");
                 }
+
+                if(channel.getId().equals(activity.getSupplierId())){
+                    Assert.throwEx("请检查活动网点数据");
+                }
+
                 TbsActivityChannelPoint activityChannelPoint = new TbsActivityChannelPoint();
                 activityChannelPoint.setCostApplyId(costApply.getId());
                 activityChannelPoint.setActivityId(activity.getId());

src/main/java/com/qs/serve/modules/third/entity/ThirtyVerification.java

@@ -27,6 +27,7 @@ public class ThirtyVerification {
     @Size(max = 30,min = 1,message = "编码长度不符合要求")
     private String verificationCode;
 
+
     /**
      * 活动主题
      * 原销路通中间表 apticlaim_zhuTi

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -919,7 +919,7 @@ public class PortalOfCostApplication {
         //保存支付信息(DHX赠品)
         if(costCode.indexOf("DHX")==0) {
             //发货单的
-            String json = ThirtyVerificationUtil.buildJson(supplier, subject, totalAmount, activityTitle, verification);
+            String json = ThirtyVerificationUtil.buildJson(supplier, subject, totalAmount, activity, verification);
             String COST_TO_PAY_API = projectApisProperties.getCostToPay();
             log.info("COST_TO_PAY_API 支付单信息:{} 数据：{}", verification.getVerificationCode(), json);
             String rs = HttpUtil.doPost(COST_TO_PAY_API, json, null);

src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java

@@ -6,6 +6,7 @@ import com.qs.serve.common.util.JsonUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
+import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.third.entity.ThirtyVerification;
 import com.qs.serve.modules.vtb.entity.VtbVerification;
 import lombok.extern.slf4j.Slf4j;
@@ -28,19 +29,19 @@ public class ThirtyVerificationUtil {
      * @param supplier
      * @param subject
      * @param totalAmount
-     * @param activityTitle
+     * @param activity
      * @param verification
      * @return
      */
     @Nullable
-    public static String buildJson(BmsSupplier supplier, BmsSubject subject, BigDecimal totalAmount, String activityTitle, VtbVerification verification) {
+    public static String buildJson(BmsSupplier supplier, BmsSubject subject, BigDecimal totalAmount, TbsActivity activity, VtbVerification verification) {
         LocalDateTime nowTime = LocalDateTime.now();
         String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         ThirtyVerification tv = new ThirtyVerification();
         tv.setId(IdUtil.getSnowFlakeId()+"");
         tv.setVerificationCode(verification.getVerificationCode());
-        tv.setActivityTitle(activityTitle);
+        tv.setActivityTitle(activity.getActTitle());
-        //tv.setActivityCode(activityCode);
+        tv.setActivityCode(activity.getActivityCode());
         tv.setCreateDate(timeString);
         tv.setStartDate(timeString);
         tv.setEndDate(timeString);
@@ -65,12 +66,12 @@ public class ThirtyVerificationUtil {
      * @param supplier
      * @param subject
      * @param totalAmount
-     * @param activityTitle
+     * @param activity
      * @param verification
      * @return
      */
     @Nullable
-    public static String buildJson(BmsSupplier supplier, BmsSubject subject, BigDecimal totalAmount, String activityTitle,
+    public static String buildJson(BmsSupplier supplier, BmsSubject subject, BigDecimal totalAmount, TbsActivity activity,
                                    LocalDateTime startTime,LocalDateTime endTime, VtbVerification verification) {
         LocalDateTime nowTime = LocalDateTime.now();
         String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
@@ -79,8 +80,8 @@ public class ThirtyVerificationUtil {
         ThirtyVerification tv = new ThirtyVerification();
         tv.setId(IdUtil.getSnowFlakeId()+"");
         tv.setVerificationCode(verification.getVerificationCode());
-        tv.setActivityTitle(activityTitle);
+        tv.setActivityTitle(activity.getActTitle());
-        //tv.setActivityCode(activityCode);
+        tv.setActivityCode(activity.getActivityCode());
         tv.setCreateDate(timeString);
         tv.setStartDate(startTimeString);
         tv.setEndDate(endTimeString);

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -515,10 +515,14 @@ public class VtbVerificationController {
         return R.ok();
     }
 
-    //@GetMapping("/toPayDev")
+    @GetMapping("/toPayDev")
     public R<?> toPayDev(){
         Long[] ids = new Long[]{
-
+                10480363L,
+                10480364L,
+                10480365L,
+                10480366L,
+                10480367L
         };
         for (Long id : ids) {
             vtbVerificationService.toPayRequest(id);

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -299,7 +299,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             supplier.setName(activity.getSupplierName());
             String COST_TO_PAY_API = projectApisProperties.getCostToPay();
             String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
-                    , activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
+                    , activity,activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
             SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
             syncLog.setTodoState(1);
             sysSyncLogService.save(syncLog);
@@ -1336,7 +1336,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 log.warn("核销去支付：{}",verification.getVerificationCode());
                 String COST_TO_PAY_API = projectApisProperties.getCostToPay();
                 String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
-                        , activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
+                        , activity,activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
                 SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
                 syncLog.setTodoState(1);
                 sysSyncLogService.save(syncLog);
@@ -1521,7 +1521,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             subject.setSubjectName(verificationSubject.getSubjectName());
             String COST_TO_PAY_API = projectApisProperties.getCostToPay();
             String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
-                    , activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
+                    , activity,activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
             SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
             syncLog.setTodoState(1);
             sysSyncLogService.save(syncLog);