From 9984a568ddd7b3d29e855771c492faa5ef3d3f5a Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 14 Sep 2020 08:23:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E6=B7=BB=E5=8A=A0skuId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yixiang/modules/activity/domain/YxStorePink.java |  2 ++
 .../service/impl/YxStorePinkServiceImpl.java         | 12 ++++++++++--
 .../co/yixiang/modules/activity/vo/PinkInfoVo.java   |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java
index c929085f..95cbb257 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java
@@ -105,6 +105,8 @@ public class YxStorePink extends BaseDomain {
     @ApiModelProperty(value = "状态1进行中2已完成3未完成")
     private Integer status;
 
+    @ApiModelProperty(value = "库存唯一值")
+    private String uniqueId;
 
     public void copy(YxStorePink source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
index 53b77572..a3febd98 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
@@ -32,6 +32,8 @@ import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper;
 import co.yixiang.modules.activity.vo.PinkInfoVo;
 import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo;
 import co.yixiang.modules.activity.vo.YxStorePinkQueryVo;
+import co.yixiang.modules.cart.domain.YxStoreCart;
+import co.yixiang.modules.cart.service.YxStoreCartService;
 import co.yixiang.modules.cart.vo.YxStoreCartQueryVo;
 import co.yixiang.modules.order.domain.YxStoreOrder;
 import co.yixiang.modules.order.service.YxStoreOrderService;
@@ -87,6 +89,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
     @Autowired
     private YxUserService yxUserService;
 
+    @Autowired
+    private YxStoreCartService yxStoreCartService;
+
 
     /**
      * 取消拼团
@@ -237,8 +242,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
         }
 
         YxUserQueryVo userInfo = userService.getYxUserById(uid);
-
-
+        YxStoreOrder yxStoreOrder = storeOrderService.getById(pink.getOrderIdKey());
+        YxStoreCart yxStoreCart = yxStoreCartService.getById(yxStoreOrder.getCartId());
         return PinkInfoVo.builder()
                 .count(count)
                 .currentPinkOrder(this.getCurrentPinkOrderId(id,uid))
@@ -249,6 +254,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
                 .storeCombination(storeCombinationQueryVo)
                 .userBool(userBool)
                 .userInfo(userInfo)
+                .uniqueId(yxStoreCart.getProductAttrUnique())
                 .build();
 
     }
@@ -277,6 +283,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
     public void createPink(YxStoreOrderQueryVo order) {
         YxStoreCombination storeCombination = combinationService.getById(order.getCombinationId());
         order = storeOrderService.handleOrder(order);
+        YxStoreCart storeCart = yxStoreCartService.getById(order.getCartId());
         int pinkCount = yxStorePinkMapper.selectCount(Wrappers.<YxStorePink>lambdaQuery()
                 .eq(YxStorePink::getOrderId,order.getOrderId()));
         if(pinkCount > 0) {
@@ -300,6 +307,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
             Date stopTime = DateUtil.offsetHour(new Date(), storeCombination.getEffectiveTime());
             storePink.setPeople(storeCombination.getPeople());
             storePink.setStopTime(stopTime);
+            storePink.setUniqueId(storeCart.getProductAttrUnique());
             if(order.getPinkId() > 0){ //其他成员入团
                 if(this.getIsPinkUid(order.getPinkId(),order.getUid())) {
                     return;
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
index cfa9e916..ee64097c 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
@@ -48,4 +48,6 @@ public class PinkInfoVo implements Serializable {
     @ApiModelProperty(value = "拼团用户信息")
     private YxUserQueryVo userInfo;
 
+    @ApiModelProperty(value = "库存唯一值")
+    private String uniqueId;
 }