订单调整

src/main/java/com/qs/serve/modules/goods/common/GoodsConst.java

@@ -12,6 +12,6 @@ public class GoodsConst {
     public static final Integer SPEC_COUNT = 3;
     public static final Integer CATE_MAX_LEVEL = 3;
     //默认账套，开平
-    public static String DEFAULT_BOOK = "001";
+    public static String DEFAULT_PlaCE = "开平";
 
 }

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -87,7 +87,7 @@ public class GoodsSpuController {
         PageVo<GoodsSpu> result = this.getShelfPage(param).getData();
         List<GoodsSpu> goodsSpuList = result.getList();
         List<String> spuCodes = goodsSpuList.stream().map(GoodsSpu::getSpuCode).collect(Collectors.toList());
-        List<OmsSpuToSkuKey> toSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_BOOK,spuCodes);
+        List<OmsSpuToSkuKey> toSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_PlaCE,spuCodes);
 
         List<InventoryCusPrice> inventoryCusPrices = null;
         try {
@@ -111,11 +111,11 @@ public class GoodsSpuController {
                 if(spu.getSpuCode().equals(skuKey.getSkuCode())){
                     GoodsSku goodsSku = goodsSkuService.getByCode(skuKey.getInvCode());
                     spu.setSkuPrice(goodsSku.getSalesPrice());
-                    spu.setVolume(skuKey.getVolume());
+                    spu.setVolume(goodsSku.getVolume().toString());
-                    spu.setWeight(skuKey.getWeight());
+                    spu.setWeight(goodsSku.getWeight().toString());
                     if(inventoryCusPrices!=null){
                         for (InventoryCusPrice cusPrice : inventoryCusPrices) {
-                            if(cusPrice.getInvCode().equals(skuKey.getInvCode())){
+                            if(cusPrice.getPrice()!=null&&cusPrice.getInvCode().equals(skuKey.getInvCode())){
                                 spu.setSkuPrice(cusPrice.getPrice());
                                 break;
                             }

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

@@ -46,7 +46,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
 
     @Override
     public List<String> getBelongPlace() {
-        return null;
+        return baseMapper.getBelongStringList();
     }
 
     @Override

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

@@ -257,8 +257,9 @@ public class GoodsSpuServiceImpl extends ServiceImpl<GoodsSpuMapper,GoodsSpu> im
 
     @Override
     public List<GoodsSpu> selectListBySpuCodes(List<String> spuCodes) {
-
+        LambdaQueryWrapper<GoodsSpu> lqw = new LambdaQueryWrapper<>();
-        return null;
+        lqw.in(GoodsSpu::getSpuCode,spuCodes);
+        return list(lqw);
     }
 
     /**
@@ -281,10 +282,10 @@ public class GoodsSpuServiceImpl extends ServiceImpl<GoodsSpuMapper,GoodsSpu> im
         if(spuCodes.size()<1){
             return new ArrayList<>();
         }
-
+        placeName = placeName.replace("产","");
         List<GoodsSpu> spuList = this.selectListBySpuCodes(spuCodes);
 
-        if(spuList.size()<1){
+        if(spuList==null||spuList.size()<1){
             return new ArrayList<>();
         }
 

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

@@ -141,7 +141,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             goodsSpuMap.put(goodsSpu.getId(),goodsSpu);
         }
         List<String> spuCodeList = spuList.stream().map(GoodsSpu::getSpuCode).collect(Collectors.toList());
-        List<OmsSpuToSkuKey> spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_BOOK,spuCodeList);
+        List<OmsSpuToSkuKey> spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_PlaCE,spuCodeList);
         Map<String,String> spuGetSkuMap = new HashMap<>(spuToSkuKeys.size());
         for (OmsSpuToSkuKey toSkuKey : spuToSkuKeys) {
             spuGetSkuMap.put(toSkuKey.getSkuCode(),toSkuKey.getInvCode());
@@ -237,7 +237,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             goodsSpuMap.put(goodsSpu.getId(),goodsSpu);
         }
         List<String> spuCodeList = spuList.stream().map(GoodsSpu::getSpuCode).collect(Collectors.toList());
-        List<OmsSpuToSkuKey> spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_BOOK,spuCodeList);
+        List<OmsSpuToSkuKey> spuToSkuKeys = goodsSpuService.getSpuToSkuInfo(GoodsConst.DEFAULT_PlaCE,spuCodeList);
         Map<String,String> spuGetSkuMap = new HashMap<>(spuToSkuKeys.size());
         for (OmsSpuToSkuKey toSkuKey : spuToSkuKeys) {
             spuGetSkuMap.put(toSkuKey.getSkuCode(),toSkuKey.getInvCode());

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

@@ -1082,12 +1082,16 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             BmsSupplier supplier = new BmsSupplier();
             supplier.setCode(activity.getSupplierCode());
             supplier.setName(activity.getSupplierName());
+            //协议类的核销，不需要调用支付接口
+            if(!costApply.getContractFlag().equals(1)){
                 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);
                 SysSyncLog syncLog = ThirtyVerificationUtil.requestToPayment("to支付请求",verification.getVerificationCode(), COST_TO_PAY_API, json);
                 syncLog.setTodoState(1);
                 sysSyncLogService.save(syncLog);
+            }
+
 
 //            //发送请求到中间服务
 //            XltApticlaim apticlaim = new XltApticlaim();