拼团添加skuId

This commit is contained in:
xuwenbo
2020-09-14 08:23:33 +08:00
parent 8e316091c1
commit 9984a568dd
3 changed files with 14 additions and 2 deletions

View File

@ -105,6 +105,8 @@ public class YxStorePink extends BaseDomain {
@ApiModelProperty(value = "状态1进行中2已完成3未完成") @ApiModelProperty(value = "状态1进行中2已完成3未完成")
private Integer status; private Integer status;
@ApiModelProperty(value = "库存唯一值")
private String uniqueId;
public void copy(YxStorePink source){ public void copy(YxStorePink source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

View File

@ -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.PinkInfoVo;
import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo;
import co.yixiang.modules.activity.vo.YxStorePinkQueryVo; 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.cart.vo.YxStoreCartQueryVo;
import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.domain.YxStoreOrder;
import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderService;
@ -87,6 +89,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
@Autowired @Autowired
private YxUserService yxUserService; private YxUserService yxUserService;
@Autowired
private YxStoreCartService yxStoreCartService;
/** /**
* 取消拼团 * 取消拼团
@ -237,8 +242,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
} }
YxUserQueryVo userInfo = userService.getYxUserById(uid); YxUserQueryVo userInfo = userService.getYxUserById(uid);
YxStoreOrder yxStoreOrder = storeOrderService.getById(pink.getOrderIdKey());
YxStoreCart yxStoreCart = yxStoreCartService.getById(yxStoreOrder.getCartId());
return PinkInfoVo.builder() return PinkInfoVo.builder()
.count(count) .count(count)
.currentPinkOrder(this.getCurrentPinkOrderId(id,uid)) .currentPinkOrder(this.getCurrentPinkOrderId(id,uid))
@ -249,6 +254,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
.storeCombination(storeCombinationQueryVo) .storeCombination(storeCombinationQueryVo)
.userBool(userBool) .userBool(userBool)
.userInfo(userInfo) .userInfo(userInfo)
.uniqueId(yxStoreCart.getProductAttrUnique())
.build(); .build();
} }
@ -277,6 +283,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
public void createPink(YxStoreOrderQueryVo order) { public void createPink(YxStoreOrderQueryVo order) {
YxStoreCombination storeCombination = combinationService.getById(order.getCombinationId()); YxStoreCombination storeCombination = combinationService.getById(order.getCombinationId());
order = storeOrderService.handleOrder(order); order = storeOrderService.handleOrder(order);
YxStoreCart storeCart = yxStoreCartService.getById(order.getCartId());
int pinkCount = yxStorePinkMapper.selectCount(Wrappers.<YxStorePink>lambdaQuery() int pinkCount = yxStorePinkMapper.selectCount(Wrappers.<YxStorePink>lambdaQuery()
.eq(YxStorePink::getOrderId,order.getOrderId())); .eq(YxStorePink::getOrderId,order.getOrderId()));
if(pinkCount > 0) { if(pinkCount > 0) {
@ -300,6 +307,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl<YxStorePinkMapper, Y
Date stopTime = DateUtil.offsetHour(new Date(), storeCombination.getEffectiveTime()); Date stopTime = DateUtil.offsetHour(new Date(), storeCombination.getEffectiveTime());
storePink.setPeople(storeCombination.getPeople()); storePink.setPeople(storeCombination.getPeople());
storePink.setStopTime(stopTime); storePink.setStopTime(stopTime);
storePink.setUniqueId(storeCart.getProductAttrUnique());
if(order.getPinkId() > 0){ //其他成员入团 if(order.getPinkId() > 0){ //其他成员入团
if(this.getIsPinkUid(order.getPinkId(),order.getUid())) { if(this.getIsPinkUid(order.getPinkId(),order.getUid())) {
return; return;

View File

@ -48,4 +48,6 @@ public class PinkInfoVo implements Serializable {
@ApiModelProperty(value = "拼团用户信息") @ApiModelProperty(value = "拼团用户信息")
private YxUserQueryVo userInfo; private YxUserQueryVo userInfo;
@ApiModelProperty(value = "库存唯一值")
private String uniqueId;
} }