erp 组合售下单

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java

@@ -210,7 +210,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
         return this;
     }
 
-    public GoblinStoreOrderVo copyMix(GoblinStoreOrder source,String mixId,String mixName) {
+    public GoblinStoreOrderVo copyMix(GoblinStoreOrder source,String mixId,String mixName,int erpHosting) {
         if (null == source) return this;
         this.setOrderId(source.getOrderId());
         this.setStoreId(source.getStoreId());
@@ -254,6 +254,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
         this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         this.setMixId(mixId);
         this.setMixName(mixName);
+        this.setErpHosting(erpHosting);
         return this;
     }
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -365,7 +365,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             nftOrder.setCreatedAt(now);
 
             GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(nftOrder.getSpuId());
-            if(boxSkuId==null || "".equals(boxSkuId)) {
+            if(nftOrder.getBoxSkuId()==null || "".equals(nftOrder.getBoxSkuId())) {
                 skuVo = redisUtils.getGoodsSkuInfoVo(nftOrder.getSkuId());
             }else{
                 skuVo = redisUtils.getGoodsSkuInfoVo(nftOrder.getBoxSkuId());
@@ -496,7 +496,11 @@ public class MixOrderServiceImpl implements IMixOrderService {
         LinkedList<Object[]> sqlDataAttr = CollectionUtil.linkedListObjectArr();
         List<String> goblinOrderSkuIdList = CollectionUtil.linkedListString();
         if (preParam != null) {
+            int erpHosting = 0;
             for (GoblinOrderSku orderSku : preParam.getOrderSkuList()) {
+                if(erpHosting == 0){
+                    erpHosting = orderSku.getErpHosting();
+                }
                 sqlDataSku.add(new Object[]{
                         orderSku.getOrderSkuId(), orderSku.getOrderId(), orderSku.getSpuId(), orderSku.getSpuName(), orderSku.getSpuPic(), orderSku.getSkuId(), orderSku.getNum(), orderSku.getSkuPrice(), orderSku.getSkuPriceActual(), orderSku.getSkuName(),
                         orderSku.getSkuNo(), orderSku.getSkuImage(), orderSku.getSkuSpecs(), orderSku.getPriceVoucher(),
@@ -521,7 +525,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
                     orderAttr.getOrderAttrId(), orderAttr.getOrderId(), orderAttr.getExpressContacts(), orderAttr.getExpressAddress(), orderAttr.getExpressAddressDetail(), orderAttr.getExpressPhone(), orderAttr.getExpressType(), orderAttr.getCreatedAt()
             });
             //订单vo
-            GoblinStoreOrderVo orderVo = GoblinStoreOrderVo.getNew().copyMix(storeOrder, mixId, mixName);
+            GoblinStoreOrderVo orderVo = GoblinStoreOrderVo.getNew().copyMix(storeOrder, mixId, mixName,erpHosting);
             //订单attr vo
             GoblinOrderAttrVo orderAttrVo = GoblinOrderAttrVo.getNew().copy(orderAttr);
             //redis 赋值