提交 接口

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

@@ -151,7 +151,7 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
         for (String orderId : goblin) {
             GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
             GoblinAppOrderListVo vos = GoblinAppOrderListVo.getNew();
-            BeanUtils.copyProperties(orderVo, vo);
+            BeanUtils.copyProperties(orderVo, vos);
             vos.setRestTime(0L);
             List<GoblinOrderSkuVo> skuVos = ObjectUtil.getGoblinOrderSkuVoArrayList();
             for (String orderSkuId : orderVo.getOrderSkuVoIds()) {

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

@@ -356,12 +356,13 @@ public class MixOrderServiceImpl implements IMixOrderService {
         String details = "";
         String payCode;
         String orderStr = "";
-        StringBuilder orderMixStr = new StringBuilder();//nft订单id || 商品订单id
+        String orderMixStr = "";
+        String nftOrderStr = "";
 
         for (GoblinNftOrder item : nftOrder) {
             payPrice = payPrice.add(item.getPriceActual());
             details = details.concat(item.getSkuTitle()).concat(",");
-            orderStr = orderStr.concat(item.getOrderId()).concat(",");
+            nftOrderStr = nftOrderStr.concat(item.getOrderId()).concat(",");
         }
 
         details = details.concat(preParam.getSkuName()).substring(1);
@@ -376,7 +377,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             httpData.add("name", preParam.getStoreName());
             httpData.add("detail", details);
             httpData.add("orderCode", masterCode);
-            httpData.add("orderId", orderStr);
+            httpData.add("orderId", nftOrderStr.concat(orderStr));
             httpData.add("clientIp", CurrentUtil.getCliIpAddr());
             httpData.add("notifyUrl", orderUrl + "/order/mix/syncOrder");
             httpData.add("createDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -430,7 +431,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
         //构建 nft sql对象
         LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
         for (GoblinNftOrder nftItem : nftOrder) {
-            orderMixStr.append(nftItem.getOrderId().contains(","));
+            orderMixStr = orderMixStr.concat(nftItem.getOrderId()).concat(",");
             nftItem.setPayCode(payCode);
             sqlDataOrder.add(new Object[]{
                     nftItem.getOrderId(), nftItem.getSpuId(), nftItem.getSkuId(), nftItem.getBoxSkuId(),
@@ -486,8 +487,8 @@ public class MixOrderServiceImpl implements IMixOrderService {
         redisUtils.setMasterCode(orderVo.getMasterOrderCode(), orderStr);
         queueUtils.setMongoList(GoblinStoreOrderVo.class.getSimpleName(), "orderId", orderVo.getOrderId(), GoblinRedisConst.REDIS_GOBLIN_ORDER, 1);
 
-        orderMixStr.append("&&".contains(orderStr));
-        redisUtils.setMasterCode(masterCode, orderMixStr.toString());
+        orderMixStr = orderMixStr.concat("&&").concat(orderStr);
+        redisUtils.setMasterCode(masterCode, orderMixStr);
 
         // 执行sql
         String sqlData = SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku, sqlDataGoblin, sqlDataAttr);