修改 汇付回调

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -85,11 +86,24 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
         String[] orderIds = redisUtils.getMasterCode(masterCode);
         List<GoblinZhengzaiPushVo> listVo = ObjectUtil.getGoblinZhengzaiPushVoArrayList();
         LocalDateTime now = LocalDateTime.now();
+        LinkedList<String> sqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
+        LinkedList<Object[]> sqlDataSku = CollectionUtil.linkedListObjectArr();
+        sqls.add(SqlMapping.get("goblin_order.store.orderStatus"));
+        sqls.add(SqlMapping.get("goblin_order.store.orderSkuStatus"));
         if (orderIds == null) {
             return ResponseDto.failure("订单不存在");
         } else {
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo storeOrderVo = redisUtils.getGoblinOrder(orderId);
+                if (!storeOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_STATUS_2.getValue())) {
+                    return ResponseDto.failure("出货失败，订单未支付");
+                }
+                storeOrderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                sqlDataOrder.add(new Object[]{
+                        storeOrderVo.getStatus(),now,
+                        storeOrderVo.getOrderId(),now,now
+                });
                 List<String> skuIds = storeOrderVo.getOrderSkuVoIds();
                 for (String skuId : skuIds) {
                     GoblinZhengzaiPushVo vo = GoblinZhengzaiPushVo.getNew();
@@ -98,8 +112,15 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                     vo.setNum(skuInfoVo.getNum());
                     vo.setSkuSpecs(skuInfoVo.getSkuSpecs());
                     vo.setSpuName(skuInfoVo.getSpuName());
+                    skuInfoVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                    sqlDataSku.add(new Object[]{
+                            skuInfoVo.getStatus(),now,
+                            skuInfoVo.getOrderSkuId(),now,now
+                    });
                 }
             }
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
+                    SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
         }
         return ResponseDto.success(listVo);
     }

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

@@ -382,7 +382,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                     //mongo
                     mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
                     //mysql
-                    queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_CREATE.getKey(),
+                    queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(),
                             SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
                 }
             } else {