cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

拼团添加skuId

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java
View File

@ -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));

12
yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
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.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;

2
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java
View File

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