修改 汇付回调 出货接口

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -105,6 +105,7 @@ public class GoblinRedisConst {
     public static final String REDIS_GOBLIN_ORDER_UN_PAY = PREFIX.concat("order:un:pay:");//未支付订单id列表 key:$randomKey
     public static final String REDIS_GOBLIN_ORDER_LIST = PREFIX.concat("order:id:list:");//用户订单id列表 key:$uid
     public static final String REDIS_GOBLIN_ORDER_MASTER = PREFIX.concat("order:masterCode:");//用户订单id列表 key:$masterCode
+    public static final String REDIS_GOBLIN_ORDER_OFFCODE = PREFIX.concat("order:offCode:");//用户订单id列表 key:$wtrieOffCode
     public static final String REDIS_GOBLIN_BACK_ORDER_ID = PREFIX.concat("order:backIds:");//用户订单下的退款订单id key:$orderId
     /* ----------------------------------------------------------------- */
     /**

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

@@ -83,7 +83,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
 
     @Override
     public ResponseDto<List<GoblinZhengzaiPushVo>> orderPush(String masterCode) {
-        String[] orderIds = redisUtils.getMasterCode(masterCode);
+        String[] orderIds = redisUtils.getOffCode(masterCode);
         List<GoblinZhengzaiPushVo> listVo = ObjectUtil.getGoblinZhengzaiPushVoArrayList();
         LocalDateTime now = LocalDateTime.now();
         LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -101,8 +101,8 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                 }
                 storeOrderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                 sqlDataOrder.add(new Object[]{
-                        storeOrderVo.getStatus(),now,
-                        storeOrderVo.getOrderId(),now,now
+                        storeOrderVo.getStatus(), now,
+                        storeOrderVo.getOrderId(), now, now
                 });
                 List<String> skuIds = storeOrderVo.getOrderSkuVoIds();
                 for (String skuId : skuIds) {
@@ -114,10 +114,14 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                     vo.setSpuName(skuInfoVo.getSpuName());
                     skuInfoVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                     sqlDataSku.add(new Object[]{
-                            skuInfoVo.getStatus(),now,
-                            skuInfoVo.getOrderSkuId(),now,now
+                            skuInfoVo.getStatus(), now,
+                            skuInfoVo.getOrderSkuId(), now, now
                     });
+                    redisUtils.setGoblinOrderSku(skuInfoVo.getOrderSkuId(), skuInfoVo);
+                    mongoUtils.updateGoblinOrderSkuVo(skuInfoVo.getOrderSkuId(), skuInfoVo);
                 }
+                redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
+                mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);
             }
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
                     SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));

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

@@ -377,6 +377,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                     orderVo.setPaymentType(paymentType);
                     orderVo.setOrderSkuVoIds(skuList);
                     redisUtils.setGoblinOrder(orderId, orderVo);
+                    redisUtils.setOffCode(orderVo.getMasterOrderCode(),orderVo.getWriteOffCode());
                     //删除未支付订单
                     redisUtils.removeGoblinOrder(null, orderId);
                     //mongo

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

@@ -646,6 +646,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 orderVo.setPaymentType(syncOrderParam.getPaymentType());
                 orderVo.setOrderSkuVoIds(skuList);
                 redisUtils.setGoblinOrder(orderId, orderVo);
+                redisUtils.setOffCode(orderVo.getMasterOrderCode(),orderVo.getWriteOffCode());
                 //删除未支付订单
                 redisUtils.removeGoblinOrder(null, orderId);
                 //mongo

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

@@ -749,6 +749,22 @@ public class GoblinRedisUtils {
         }
     }
 
+    //主订单对应的出货吗
+    public void setOffCode(String writeOffCode, String masterCode) {
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_OFFCODE.concat(writeOffCode);
+        redisUtil.set(redisKey, masterCode);
+    }
+
+    public String[] getOffCode(String masterCode) {
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_OFFCODE.concat(masterCode);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return null;
+        } else {
+            return getMasterCode((String) obj);
+        }
+    }
+
     //覆盖 退款订单vo
     public void setBackOrderVo(String backOrderId, GoblinBackOrderVo vo) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_BACK.concat(backOrderId);