增加店铺id

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixDetailsVo.java

@@ -68,6 +68,8 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
     private Integer payType;
     @ApiModelProperty(position = 25, value = "xls名称")
     private String xlsName;
+    @ApiModelProperty(position = 26, value = "店铺id")
+    private String storeId;
 
     private static final GoblinMixDetailsVo obj = new GoblinMixDetailsVo();
 
@@ -108,6 +110,7 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
         this.setPrice(price);
         this.setPayType(source.getPayType());
         this.setXlsName(source.getXlsName());
+        this.setStoreId(source.getStoreId());
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinMixDetailsParam.java

@@ -51,6 +51,8 @@ public class GoblinMixDetailsParam implements Serializable, Cloneable {
     private Integer payType;
     @ApiModelProperty(position = 20, value = "xls名称")
     private String xlsName;
+    @ApiModelProperty(position = 21, value = "店铺id")
+    private String storeId;
 
 
     private static final GoblinMixDetailsParam obj = new GoblinMixDetailsParam();

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinMix.java

@@ -142,6 +142,11 @@ public class GoblinMix implements Serializable {
      */
     private Integer delTag;
 
+    /**
+     * 店铺id
+     */
+    private Integer storeId;
+
     /**
      * 补充字段
      */

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

@@ -162,7 +162,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
                 mixId, uid, vo.getName(), vo.getTimeStart(), vo.getTimeEnd(), 6, vo.getShowPosition(),
                 vo.getSellName(), vo.getExpressPrice(), vo.getIntro(), vo.getWatchType(), vo.getCoverPic(),
                 vo.getVideo(), vo.getDetailUrl(), vo.getDetails(), vo.getStock(), vo.getStockLock(),
-                vo.getIsLock(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), vo.getPayType(), LocalDateTime.now()
+                vo.getIsLock(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), vo.getPayType(),vo.getStoreId(), LocalDateTime.now()
         });
         //设置redis
         redisUtils.setMixDetails(mixId, vo);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -161,7 +161,7 @@ goblin_list_remove = UPDATE goblin_list set del_tag = 1 , updated_at = ? WHERE l
 
 
 #----                       混合售卖                             ----
-goblin_mix_insert = INSERT INTO goblin_mix (`mix_id`,`uid`,`name`,`time_start`,`time_end`,`status`,`show_position`,`sell_name`,`express_price`,`intro`,`watch_type`,`cover_pic`,`video`,`detail_url`,`details`,`stock`,`stock_lock`,`is_lock`,`limit`,`white_type`,`white_url`,`pay_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_mix_insert = INSERT INTO goblin_mix (`mix_id`,`uid`,`name`,`time_start`,`time_end`,`status`,`show_position`,`sell_name`,`express_price`,`intro`,`watch_type`,`cover_pic`,`video`,`detail_url`,`details`,`stock`,`stock_lock`,`is_lock`,`limit`,`white_type`,`white_url`,`pay_type`,`store_id`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_mix_details_insert = INSERT INTO goblin_mix_details (`mix_id`,`position`,`spu_id`,`sku_id`,`price`,`price_v`,`product_id`,`count`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?)
 goblin_mix_status_update = UPDATE goblin_mix_details SET status = ?  updated_at = ? WHERE mix_id = ?
 goblin_mix_update = UPDATE goblin_mix_details SET show_position = ? , limit=?,white_type=?,white_url=?  updated_at = ? WHERE mix_id = ?
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.order.service.impl;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.constant.NftAccStatusEnum;
 import com.liquidnet.service.goblin.dto.GoblinUserNftAccInfoVo;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -47,6 +49,9 @@ public class MixOrderServiceImpl implements IMixOrderService {
         GoblinMixDetailsVo mixVo = redisUtils.getMixDetails(param.getMixId());
         String mixId = mixVo.getMixId();
         String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), "");
+        String headerCliSource = CurrentUtil.getHeaderCliSource(), headerCliVersion = CurrentUtil.getHeaderCliVersion();
+        String source = headerCliSource == null ? "" : headerCliSource,version = headerCliVersion == null ? "" : headerCliVersion;
+
         List<String> canBuyIds = CollectionUtil.linkedListString();//有库存的id
         List<String> boxSkuId = CollectionUtil.linkedListString();//盲盒种的skuid
         List<String> stockSkuId = CollectionUtil.linkedListString();  // 盲盒id
@@ -124,11 +129,30 @@ public class MixOrderServiceImpl implements IMixOrderService {
                 return ResponseDto.failure("您还未开通数字账户");
             }
         }
+        //下单
 
 
         return null;
     }
 
+    //商品订单
+    private void goblinOrder() {
+    }
+
+    //nft订单
+    private void nftOrder(List<GoblinGoodsSkuInfoVo> nftSkuVo, LocalDateTime now, String payType) {
+        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();
+            if (payType.equals("applepay")) {
+                totalPrice = skuVo.getPriceV();
+            }
+        }
+    }
+
     @Override
     public String syncOrder(SyncOrderParam syncOrderParam) {
         return null;