Merge remote-tracking branch 'origin/hjc_shopcar' into dev_yy_dh

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

@@ -66,6 +66,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         List<String> skuAndPreListAndNumber = CollectionUtil.arrayListString();
         List<String> platformCodeList = CollectionUtil.arrayListString();
         List<String> storeCodeList = CollectionUtil.arrayListString();
+        List<String> storeSpuIds = CollectionUtil.linkedListString();
         List<GoblinOrderSqlParam> orderSqlParams = ObjectUtil.getGoblinOrderSqlParamArrayListList();
         String orderMasterCode = IDGenerator.storeMasterCode();//总订单id
 
@@ -133,7 +134,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 preParam.setSkuName(preParam.getSkuName() + "," + pre.getSkuName());
                 preParam.setOrderIdList(preParam.getOrderIdList() + "," + pre.getOrderIdList());
                 preParam.setPlatformSpuIds(pre.getPlatformSpuIds());
-                preParam.setStoreSpuIds(pre.getStoreSpuIds());
+                storeSpuIds.addAll(pre.getStoreSpuIds());
+                preParam.setStoreSpuIds(storeSpuIds);
 
                 GoblinOrderSqlParam sqlParam = GoblinOrderSqlParam.getNew();
                 sqlParam.setStoreOrder(pre.getStoreOrder());

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

@@ -170,7 +170,12 @@ public class GoblinOrderUtils {
                     } else {
                         for (String targetId : targetList) {
                             for (GoblinOrderSku skuOrderVo : goblinOrderSkuList) {
-                                if (targetId.equals(skuOrderVo.getSpuId())) {
+                                String orderVoSpuId = skuOrderVo.getSpuId();
+                                String pre = GoblinStatusConst.MarketPreStatus.getPre(orderVoSpuId);
+                                if (pre != null) {
+                                    orderVoSpuId = orderVoSpuId.split(pre)[0];
+                                }
+                                if (targetId.equals(orderVoSpuId)) {
                                     targetPrice = targetPrice.add(skuOrderVo.getSkuPriceActual());
                                 }
                             }