增加店铺id

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

@@ -8,6 +8,8 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.constant.NftAccStatusEnum;
 import com.liquidnet.service.goblin.dto.GoblinUserNftAccInfoVo;
+import com.liquidnet.service.goblin.dto.manage.AddressVo;
+import com.liquidnet.service.goblin.dto.manage.GoblinOrderStoreParam;
 import com.liquidnet.service.goblin.dto.manage.MixOrderParam;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinNftOrder;
@@ -83,6 +85,8 @@ public class MixOrderServiceImpl implements IMixOrderService {
         //构建 各个商品信息
         List<GoblinGoodsSkuInfoVo> skuInfoList = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();
         List<GoblinGoodsSkuInfoVo> nftInfoList = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();
+        HashMap<String, Object> skuMix = CollectionUtil.mapStringObject();//mix配置的sku数量和价格
+        HashMap<String, Object> nftMix = CollectionUtil.mapStringObject();//mix配置的nft数量和价格
         for (GoblinMixDetailsItemVo itemVo : mixVo.getItem()) {
             String skuId = itemVo.getSkuId();
             GoblinGoodsSkuInfoVo skuInfoVo = redisUtils.getGoodsSkuInfoVo(skuId);
@@ -122,8 +126,14 @@ public class MixOrderServiceImpl implements IMixOrderService {
             }
             if (skuInfoVo.getSkuType() == 0) {
                 skuInfoList.add(skuInfoVo);
+                skuMix.put(skuInfoVo.getSkuId() + "price", itemVo.getPrice());
+                skuMix.put(skuInfoVo.getSkuId() + "count", itemVo.getCount());
             } else if (skuInfoVo.getSkuType() == 1) {
                 nftInfoList.add(skuInfoVo);
+                nftMix.put(skuInfoVo.getSkuId() + "price", itemVo.getPrice());
+                nftMix.put(skuInfoVo.getSkuId() + "priceV", itemVo.getPriceV());
+                nftMix.put(skuInfoVo.getSkuId() + "produceId", itemVo.getProductId());
+                nftMix.put(skuInfoVo.getSkuId() + "count", itemVo.getCount());
             } else {
                 return ResponseDto.failure("参数异常");
             }
@@ -137,31 +147,35 @@ public class MixOrderServiceImpl implements IMixOrderService {
         }
         //下单
         //生成nft订单
-        List<GoblinNftOrder> nftOrderList =  nftOrder(nftInfoList,boxSkuId,mobile,source,version,nickName,nt,uid,param.getPayType(),param.getDeviceFrom());
+        List<GoblinNftOrder> nftOrderList = nftOrder(nftInfoList, nftMix, boxSkuId, mobile, source, version, nickName, nt, uid, param.getPayType(), param.getDeviceFrom());
         //生成goblin订单
 
-//        return payOrder();
+        return ResponseDto.success(payOrder());
     }
 
     //商品订单
-    private  List<GoblinStoreOrder> goblinOrder() {
-    }
+//    private List<GoblinStoreOrder> goblinOrder(List<GoblinGoodsSkuInfoVo> skuVoList, AddressVo addressVo) {
+//        for (GoblinGoodsSkuInfoVo skuVo : skuVoList) {
+//            String orderId = IDGenerator.nextSnowId();
+//            String orderCode = IDGenerator.storeCode(orderId);
+//            String storeId = skuVo.getStoreId();
+//        }
+//    }
 
     //nft订单
-    private List<GoblinNftOrder> nftOrder(List<GoblinGoodsSkuInfoVo> nftSkuVo, HashMap<String, Object> boxSkuId, String mobile, String source, String version, String nickName, LocalDateTime now, String uid, String payType, String deviceFrom) {
+    private List<GoblinNftOrder> nftOrder(List<GoblinGoodsSkuInfoVo> nftSkuVo, HashMap<String, Object> nftMix, HashMap<String, Object> boxSkuId, String mobile, String source, String version, String nickName, LocalDateTime now, String uid, String payType, String deviceFrom) {
         List<GoblinNftOrder> goblinNftOrderList = ObjectUtil.goblinNftOrderList();
         for (GoblinGoodsSkuInfoVo skuVo : nftSkuVo) {
             BigDecimal voucherPrice = BigDecimal.ZERO;
             BigDecimal storeVoucherPrice = BigDecimal.ZERO;
             String orderId = IDGenerator.nextSnowId();
             String orderCode = IDGenerator.storeCode(orderId);
-            BigDecimal totalPrice = skuVo.getPrice();
+            BigDecimal totalPrice = (BigDecimal) nftMix.get(skuVo.getSkuId() + "price");
             if (payType.equals("applepay")) {
-                totalPrice = skuVo.getPriceV();
+                totalPrice = (BigDecimal) nftMix.get(skuVo.getSkuId() + "priceV");
             }
             GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(skuVo.getStoreId());
             String storeName = storeInfoVo.getStoreName();
-
             // 生成订单
             GoblinNftOrder nftOrder = GoblinNftOrder.getNew();
             nftOrder.setOrderId(orderId);
@@ -204,10 +218,10 @@ public class MixOrderServiceImpl implements IMixOrderService {
     }
 
 
-//    private GoblinPayInnerResultVo payOrder(List<GoblinNftOrder> nftOrder, List<GoblinStoreOrder> goblinOrder, String produceId) {
-//        GoblinPayInnerResultVo NftPayResultVo = GoblinPayInnerResultVo.getNew();
-//        return NftPayResultVo;
-//    }
+    private GoblinPayInnerResultVo payOrder() {
+        GoblinPayInnerResultVo NftPayResultVo = GoblinPayInnerResultVo.getNew();
+        return NftPayResultVo;
+    }
 
     @Override
     public String syncOrder(SyncOrderParam syncOrderParam) {