caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加取消订单生成店铺流水，优化代码

Browse Source
This commit is contained in:
paulGao 2022-07-07 17:25:15 +08:00
parent 727ddd3198
commit 82a0cd0336
4 changed files with 68 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,10 +168,12 @@ public class CheckDataRender implements CartRenderStep {
try {
//筛选属于当前店铺的优惠券
storeCart.getValue().forEach(i -> i.getPromotionMap().forEach((key, value) -> {
JSONObject promotionsObj = JSONUtil.parseObj(value);
Coupon coupon = JSONUtil.toBean(promotionsObj, Coupon.class);
if (key.contains(PromotionTypeEnum.COUPON.name()) && coupon.getStoreId().equals(storeCart.getKey())) {
cartVO.getCanReceiveCoupon().add(new CouponVO(coupon));
if (key.contains(PromotionTypeEnum.COUPON.name())) {
JSONObject promotionsObj = JSONUtil.parseObj(value);
Coupon coupon = JSONUtil.toBean(promotionsObj, Coupon.class);
if (key.contains(PromotionTypeEnum.COUPON.name()) && coupon.getStoreId().equals(storeCart.getKey())) {
cartVO.getCanReceiveCoupon().add(new CouponVO(coupon));
}
}
}));
} catch (Exception e) {

1
framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java
View File

@ -186,7 +186,6 @@ public class SkuPromotionRender implements CartRenderStep {
*/
private void checkPromotionQuantity(TradeDTO tradeDTO) {
for (CartSkuVO cartSkuVO : tradeDTO.getCheckedSkuList()) {
cartSkuVO.getPromotionMap();
List<PromotionSkuVO> joinPromotion = cartSkuVO.getPriceDetailDTO().getJoinPromotion();
if (!joinPromotion.isEmpty()) {
for (PromotionSkuVO promotionSkuVO : joinPromotion) {

2
framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java
View File

@ -136,7 +136,7 @@ public class CartServiceImpl implements CartService {
}
CartTypeEnum cartTypeEnum = getCartType(cartType);
GoodsSku dataSku = checkGoods(skuId);
Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, cartType);
Map<String, Object> promotionMap = promotionGoodsService.getCurrentGoodsPromotion(dataSku, cartTypeEnum.name());
try {
//购物车方式购买需要保存之前的选择，其他方式购买，则直接抹除掉之前的记录

65
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -21,10 +21,7 @@ import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.order.aop.OrderLogPoint;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.dos.Receipt;
import cn.lili.modules.order.order.entity.dos.Trade;
import cn.lili.modules.order.order.entity.dos.*;
import cn.lili.modules.order.order.entity.dto.OrderBatchDeliverDTO;
import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
import cn.lili.modules.order.order.entity.dto.OrderMessage;
@ -305,6 +302,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
order.setCancelReason(reason);
//修改订单
this.updateById(order);
//生成店铺退款流水
this.generatorStoreRefundFlow(order);
orderStatusMessage(order);
return order;
} else {
@ -321,6 +320,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
order.setOrderStatus(OrderStatusEnum.CANCELLED.name());
order.setCancelReason(reason);
this.updateById(order);
//生成店铺退款流水
this.generatorStoreRefundFlow(order);
orderStatusMessage(order);
}
@ -795,6 +796,62 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
this.sendUpdateStatusMessage(orderMessage);
}
/**
* 生成店铺退款流水
*
* @param order 订单信息
*/
private void generatorStoreRefundFlow(Order order) {
// 判断订单是否是付款
if (!PayStatusEnum.PAID.name().equals((order.getPayStatus()))) {
return;
}
List<OrderItem> items = orderItemService.getByOrderSn(order.getSn());
List<StoreFlow> storeFlows = new ArrayList<>();
String orderPromotionType = order.getOrderPromotionType();
for (OrderItem item : items) {
StoreFlow storeFlow = new StoreFlow();
BeanUtil.copyProperties(item, storeFlow);
//入账
storeFlow.setId(SnowFlake.getIdStr());
storeFlow.setFlowType(FlowTypeEnum.REFUND.name());
storeFlow.setSn(SnowFlake.createStr("SF"));
storeFlow.setOrderSn(item.getOrderSn());
storeFlow.setOrderItemSn(item.getSn());
storeFlow.setStoreId(order.getStoreId());
storeFlow.setStoreName(order.getStoreName());
storeFlow.setMemberId(order.getMemberId());
storeFlow.setMemberName(order.getMemberName());
storeFlow.setGoodsName(item.getGoodsName());
storeFlow.setOrderPromotionType(item.getPromotionType());
//计算平台佣金
storeFlow.setFinalPrice(item.getPriceDetailDTO().getFlowPrice());
storeFlow.setCommissionPrice(item.getPriceDetailDTO().getPlatFormCommission());
storeFlow.setDistributionRebate(item.getPriceDetailDTO().getDistributionCommission());
storeFlow.setBillPrice(item.getPriceDetailDTO().getBillPrice());
//兼容为空，以及普通订单操作
if (CharSequenceUtil.isNotEmpty(orderPromotionType)) {
//如果为砍价活动，填写砍价结算价
if (orderPromotionType.equals(OrderPromotionTypeEnum.KANJIA.name())) {
storeFlow.setKanjiaSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
}
//如果为砍价活动，填写砍价结算价
else if (orderPromotionType.equals(OrderPromotionTypeEnum.POINTS.name())) {
storeFlow.setPointSettlementPrice(item.getPriceDetailDTO().getSettlementPrice());
}
}
//添加支付方式
storeFlow.setPaymentName(order.getPaymentMethod());
//添加第三方支付流水号
storeFlow.setTransactionId(order.getReceivableNo());
storeFlows.add(storeFlow);
}
storeFlowService.saveBatch(storeFlows);
}
/**
* 此方法只提供内部调用，调用前应该做好权限处理
* 修改订单状态