修改 下单

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -22,7 +22,11 @@ public class CollectionUtil {
     private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<BigDecimal> BIG_DECIMALS_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<BigDecimal> BIGDECIMAL_ARRAY_LIST = new ArrayList<>();
+    private static final String[] STRING_ARRAY = new String[]{};
 
+    public static String[] stringArray() {
+        return STRING_ARRAY.clone();
+    }
     public static HashMap<String, String> mapStringString() {
         return (HashMap<String, String>) STRING_STRING_HASH_MAP.clone();
     }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/receiver/AbstractOrderCloseReceiver.java

@@ -200,7 +200,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
                 String listId = (null == goblinListCollectVo) ? null : goblinListCollectVo.getListId();
                 log.debug("listId : {}", listId);
                 String mixId = nftOrder.getMixId();
-                if(mixId!=null && !mixId.equals("")){
+                if (mixId != null && !mixId.equals("")) {
                     listId = mixId;
                     log.debug("mixId : {}", listId);
                 }
@@ -241,6 +241,9 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
             String[] goblin = map.get("goblin");
 
             for (String orderId : goblin) {
+                if("".equals(orderId)){
+                    break;
+                }
                 GoblinStoreOrderVo orderVo = getGoblinOrder(orderId);
                 if (orderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_STATUS_0.getValue())) {//订单回滚
                     LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -288,6 +291,9 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
             }
 
             for (String orderId : nft) {
+                if("".equals(orderId)){
+                    break;
+                }
                 checkNftOrderTime(orderId);
             }
 
@@ -403,8 +409,14 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
             return null;
         } else {
             String[] a = ((String) obj).split("&&");
-            String[] nftA = a[0].split(",");
-            String[] goblinA = a[1].split(",");
+            String[] nftA = CollectionUtil.stringArray();
+            String[] goblinA = CollectionUtil.stringArray();
+            if (a.length > 0) {
+                nftA = a[0].split(",");
+            }
+            if (a.length > 1) {
+                goblinA = a[1].split(",");
+            }
             HashMap<String, String[]> map = mixIdMap();
             map.put("nft", nftA);
             map.put("goblin", goblinA);

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

@@ -139,6 +139,9 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
         List<GoblinNftOrderDetailsVo> nftOrderListVos = ObjectUtil.goblinNftOrderDetailsVoArrayList();
 
         for (String orderId : nft) {
+            if("".equals(orderId)){
+                break;
+            }
             // 订单信息
             GoblinNftOrderVo orderVo = redisUtils.getGoblinNftOrder(orderId);
             GoblinNftOrderDetailsVo orderDetails = GoblinNftOrderDetailsVo.getNew().copy(orderVo);
@@ -149,6 +152,9 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
             nftOrderListVos.add(orderDetails);
         }
         for (String orderId : goblin) {
+            if("".equals(orderId)){
+                break;
+            }
             GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
             GoblinAppOrderListVo vos = GoblinAppOrderListVo.getNew();
             BeanUtils.copyProperties(orderVo, vos);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -1614,8 +1614,14 @@ public class GoblinRedisUtils {
             return null;
         } else {
             String[] a = ((String) obj).split("&&");
-            String[] nftA = a[0].split(",");
-            String[] goblinA = a[1].split(",");
+            String[] nftA = CollectionUtil.stringArray();
+            String[] goblinA = CollectionUtil.stringArray();
+            if (a.length > 0) {
+                nftA = a[0].split(",");
+            }
+            if (a.length > 1) {
+                goblinA = a[1].split(",");
+            }
             HashMap<String, String[]> map = ObjectUtil.mixIdMap();
             map.put("nft", nftA);
             map.put("goblin", goblinA);

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

@@ -554,6 +554,7 @@ public class GoblinNftOrderUtils {
 //                String endListId = newListIds.get(index);
                 // 判断库存
                 int surplusGeneral = goblinRedisUtils.decrSkuStock(listId, goodsSkuInfoVo.getSkuId(), number);
+                log.error("剩余 skuId = "+surplusGeneral);
                 if (surplusGeneral < 0) {
                     goblinRedisUtils.incrSkuStock(listId, goodsSkuInfoVo.getSkuId(), number);
                     return lotteryDraw(skuIdList, number, nowTime, listId);

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

@@ -468,8 +468,14 @@ public class GoblinRedisUtils {
             return null;
         } else {
             String[] a = ((String) obj).split("&&");
-            String[] nftA = a[0].split(",");
-            String[] goblinA = a[1].split(",");
+            String[] nftA = CollectionUtil.stringArray();
+            String[] goblinA = CollectionUtil.stringArray();
+            if (a.length > 0) {
+                nftA = a[0].split(",");
+            }
+            if (a.length > 1) {
+                goblinA = a[1].split(",");
+            }
             HashMap<String, String[]> map = ObjectUtil.mixIdMap();
             map.put("nft", nftA);
             map.put("goblin", goblinA);