erp 组合购提交

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

@@ -65,6 +65,8 @@ public class WdtServiceImpl implements IGoblinErpService {
     private int redisSize;
     @Value("${liquidnet.erp.wdt.store.shop_no}")
     private String shopNo;
+    @Value("${liquidnet.erp.wdt.contentSize}")
+    private int contentSize;
 
     @Override
     public ResponseDto<Boolean> initErpStock(String spuId, int min) {
@@ -174,18 +176,18 @@ public class WdtServiceImpl implements IGoblinErpService {
         List<List<String>> orderIdList = CollectionUtil.arrayListListString();
         // 获取 订单id 数据
         if ("".equals(singleId) || null == singleId) {
-            for (int i = 0; i < redisSize; i++) {
-                List<String> list = goblinRedisUtils.getRange(i);
-                orderIdList.add(list);
-                //todo 删除redis key
-            }
-
-//            List<String> list = CollectionUtil.arrayListString();
-//            for (int i = 0; i < contentSize; i++) {
-//                String orderId = goblinRedisUtils.erpLeftPop(i);
-//                list.add(orderId);
+//            for (int i = 0; i < redisSize; i++) {
+//                List<String> list = goblinRedisUtils.getRange(i);
+//                orderIdList.add(list);
+//                //todo 删除redis key
 //            }
-//            orderIdList.add(list);
+
+            List<String> list = CollectionUtil.arrayListString();
+            for (int i = 0; i < contentSize; i++) {
+                String orderId = goblinRedisUtils.erpLeftPop(i);
+                list.add(orderId);
+            }
+            orderIdList.add(list);
         } else {
             List<String> a = CollectionUtil.arrayListString();
             a.add(singleId);

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

@@ -243,6 +243,13 @@ public class MixOrderServiceImpl implements IMixOrderService {
             orderSku.setCreatedAt(now);
             orderSku.setSpuName(spuVo.getName());
             orderSku.setSpuPic(spuVo.getCoverPic());
+
+            orderSku.setSpuErpCode(spuVo.getSpuErpCode());
+            orderSku.setSkuErpCode(skuVo.getSkuErpCode());
+            orderSku.setErpType(spuVo.getErpType());
+            orderSku.setErpWarehouseNo(skuVo.getErpWarehouseNo());
+            orderSku.setErpHosting(skuVo.getErpHosting());
+
             goblinOrderSkuList.add(orderSku);
         }
         GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(storeId);
@@ -357,6 +364,18 @@ public class MixOrderServiceImpl implements IMixOrderService {
             nftOrder.setIpAddress(CurrentUtil.getCliIpAddr());
             nftOrder.setCreatedAt(now);
 
+            GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(nftOrder.getSpuId());
+            if(boxSkuId==null || "".equals(boxSkuId)) {
+                skuVo = redisUtils.getGoodsSkuInfoVo(nftOrder.getSkuId());
+            }else{
+                skuVo = redisUtils.getGoodsSkuInfoVo(nftOrder.getBoxSkuId());
+            }
+            nftOrder.setSpuErpCode(spuVo.getSpuErpCode());
+            nftOrder.setSkuErpCode(skuVo.getSkuErpCode());
+            nftOrder.setErpType(spuVo.getErpType());
+            nftOrder.setErpWarehouseNo(skuVo.getErpWarehouseNo());
+            nftOrder.setErpHosting(skuVo.getErpHosting());
+
             goblinNftOrderList.add(nftOrder);
         }
         return goblinNftOrderList;
@@ -458,7 +477,9 @@ public class MixOrderServiceImpl implements IMixOrderService {
                     nftItem.getNum(), nftItem.getStoreId(), nftItem.getStoreName(), nftItem.getOrderCode(), nftItem.getUserId(), nftItem.getUserName(), nftItem.getUserMobile(), nftItem.getPriceTotal(), nftItem.getPriceCoupon(),
                     nftItem.getStorePriceCoupon(), nftItem.getPriceRedEnvelope(), nftItem.getPriceVoucher(), nftItem.getPriceActual(), nftItem.getUcouponId(), nftItem.getStoreCouponId(), nftItem.getRedEnvelopeCode(), nftItem.getStatus(), nftItem.getSource(),
                     nftItem.getOrderType(), nftItem.getPayType(), nftItem.getDeviceFrom(), nftItem.getVersion(), nftItem.getPayCountdownMinute(), nftItem.getIpAddress(), nftItem.getCreatedAt(), nftItem.getPayCode(),
-                    nftItem.getSkuTitle(), nftItem.getListId(), nftItem.getExCode(), mixId, masterCode
+                    nftItem.getSkuTitle(), nftItem.getListId(), nftItem.getExCode(), mixId, masterCode,
+                    nftItem.getSpuErpCode(), nftItem.getSkuErpCode(), nftItem.getErpType(), nftItem.getErpWarehouseNo(), nftItem.getErpHosting(),
+
             });
             // 订单vo redis
             GoblinNftOrderVo orderVo = GoblinNftOrderVo.getNew().copyMix(nftItem, mixId, mixName);
@@ -478,7 +499,9 @@ public class MixOrderServiceImpl implements IMixOrderService {
             for (GoblinOrderSku orderSku : preParam.getOrderSkuList()) {
                 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(), orderSku.getCreatedAt()
+                        orderSku.getSkuNo(), orderSku.getSkuImage(), orderSku.getSkuSpecs(), orderSku.getPriceVoucher(),
+                        orderSku.getSpuErpCode(), orderSku.getSkuErpCode(), orderSku.getErpType(), orderSku.getErpWarehouseNo(), orderSku.getErpHosting(),
+                        orderSku.getCreatedAt()
                 });
                 //订单 orderSku Vo
                 GoblinOrderSkuVo orderSkuVo = GoblinOrderSkuVo.getNew().copy(orderSku);
@@ -612,6 +635,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             log.error("Mix订单Id为 {} 的订单正在退款 或者已退款", orderId);
         } else if (status == 1) {
             log.error("Mix订单Id {} 的订单正常流程", orderId);
+            orderUtils.addErpPush(orderVo.getOrderId(),orderVo.getErpHosting());
             storeOrder.setPaymentType(paymentType);
             storeOrder.setPaymentId(paymentId);
             storeOrder.setPayCode(code);
@@ -707,6 +731,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             String uid = orderVo.getUserId();
             Integer orderStatusOld = orderVo.getStatus();
             LocalDateTime now = LocalDateTime.now();
+            orderUtils.addErpPush(orderVo.getOrderId(),orderVo.getErpHosting());
             // 更新订单信息
             if (StringUtil.isEmpty(paymentType)) {
                 orderVo.setPaymentType("");

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

@@ -560,14 +560,15 @@ public class GoblinOrderUtils {
     public void addErpPush(String orderId, int erpHosting) {
         if (erpHosting == 0) {
         } else {
-            for (int i = 0; i < redisSize; i++) {
-                boolean isFull = redisUtils.erpAddPush(i, orderId) > contentSize;
-                if (isFull) {
-                    redisUtils.erpPopPush(i);
-                } else {
-                    break;
-                }
-            }
+            redisUtils.erpAddPush(0, orderId);
+//            for (int i = 0; i < redisSize; i++) {
+//                boolean isFull = redisUtils.erpAddPush(i, orderId) > contentSize;
+//                if (isFull) {
+//                    redisUtils.erpPopPush(i);
+//                } else {
+//                    break;
+//                }
+//            }
         }
     }
 }