code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消订单，恢复积分

Browse Source
This commit is contained in:
lifenlong
2021-07-27 16:58:38 +08:00
parent 02f3bde2b4
commit 1b60079481
6 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
View File

@@ -21,7 +21,9 @@ import cn.lili.modules.order.cart.render.CartRenderStep;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.vos.PointsGoodsVO;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.promotion.service.PointsGoodsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
@@ -54,6 +56,9 @@ public class CheckDataRender implements CartRenderStep {
@Autowired
private MemberService memberService;
@Autowired
private PointsGoodsService pointsGoodsService;
@Override
public void render(TradeDTO tradeDTO) {
//预校验
@@ -143,7 +148,7 @@ public class CheckDataRender implements CartRenderStep {
private void preCalibration(TradeDTO tradeDTO) {
//拼团订单预校验
if(tradeDTO.getCartTypeEnum().equals(CartTypeEnum.PINTUAN)){
if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.PINTUAN)) {
//拼团判定，不能参与自己创建的拼团
if (tradeDTO.getParentOrderSn() != null) {
//订单接受
@@ -164,10 +169,16 @@ public class CheckDataRender implements CartRenderStep {
}
}
}
//积分商品，判断用户积分是否满足
}else if(tradeDTO.getCartTypeEnum().equals(CartTypeEnum.POINTS)){
Member member=memberService.getUserInfo();
if(member.getPoint()<tradeDTO.getSkuList().get(0).getPoint()){
//积分商品，判断用户积分是否满足
} else if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.POINTS)) {
String skuId = tradeDTO.getSkuList().get(0).getGoodsSku().getId();
//获取积分商品VO
PointsGoodsVO pointsGoodsVO = pointsGoodsService.getPointsGoodsVOByMongo(skuId);
if(pointsGoodsVO==null){
throw new ServiceException(ResultCode.POINT_GOODS_ERROR);
}
Member member = memberService.getUserInfo();
if (member.getPoint() < pointsGoodsVO.getPoints()) {
throw new ServiceException(ResultCode.USER_POINTS_ERROR);
}
}

2
framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java
View File

@@ -23,7 +23,7 @@ public enum OrderPromotionTypeEnum {
/**
* 积分订单
*/
POINT,
POINTS,
/**
* 砍价订单
*/

2
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
View File

File diff suppressed because one or more lines are too long

2
framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityGoodsService.java
View File

@@ -29,7 +29,7 @@ public interface KanjiaActivityGoodsService extends IService<KanjiaActivityGoods
* @param kanJiaActivityGoodsDTOS 砍价商品
* @return 是否添加成功
*/
boolean add(KanjiaActivityGoodsOperationDTO kanJiaActivityGoodsDTOS);
Boolean add(KanjiaActivityGoodsOperationDTO kanJiaActivityGoodsDTOS);
/**
* 查询砍价活动商品分页信息

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java
View File

@@ -70,7 +70,7 @@ public class KanjiaActivityGoodsServiceImpl extends ServiceImpl<KanJiaActivityGo
@Override
public boolean add(KanjiaActivityGoodsOperationDTO kanJiaActivityGoodsOperationDTO) {
public Boolean add(KanjiaActivityGoodsOperationDTO kanJiaActivityGoodsOperationDTO) {
List<KanjiaActivityGoods> kanjiaActivityGoodsList = new ArrayList<>();
for (KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO : kanJiaActivityGoodsOperationDTO.getPromotionGoodsList()) {
//根据skuId查询商品信息