mall/huimai
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main-zhb'

Browse Source 
# Conflicts:
#	mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
This commit is contained in:
zhanghb
2025-02-20 11:37:55 +08:00
parent 10d3387b91 6225d23311
commit 9b6a3a3fdb
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
View File

@@ -144,6 +144,15 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
@Autowired @Autowired
private UmsDevelopmentFundMapper umsDevelopmentFundMapper; private UmsDevelopmentFundMapper umsDevelopmentFundMapper;
@Autowired
private UmsMemberRelationTreeMapper memberRelationTreeMapper;
@Autowired
private UmsMemberLevelMapper memberLevelMapper;
@Autowired
private MemberPointsSplitProfitService memberPointsSplitProfitService;
@Value("${kuaidi100.url}") @Value("${kuaidi100.url}")
private String KUAIDI100_URL; private String KUAIDI100_URL;
@@ -1830,6 +1839,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()) {
OmsOrder order = list.get(0); OmsOrder order = list.get(0);
// 获取下单用户信息
UmsMember member = memberMapper.selectByPrimaryKey(order.getMemberId());
//获取订单实付金额 //获取订单实付金额
BigDecimal payAmount = order.getPayAmount(); BigDecimal payAmount = order.getPayAmount();
//获取商品信息 //获取商品信息
@@ -1844,8 +1855,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
if (pmsProduct.getPointsAreaStatus() == 1) { if (pmsProduct.getPointsAreaStatus() == 1) {
//奖励积分是购买的价格的100% //奖励积分是购买的价格的100%
int rewardPoints = order.getPayAmount().intValue(); int rewardPoints = order.getPayAmount().intValue();
// 获取用户信息
UmsMember member = memberMapper.selectByPrimaryKey(order.getMemberId());
// 增加用户积分 // 增加用户积分
if (member != null) { if (member != null) {
@@ -1860,6 +1869,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
//增加基金积分 //增加基金积分
int fundPoints = (int)(rewardPoints * 0.05); int fundPoints = (int)(rewardPoints * 0.05);
umsDevelopmentFundMapper.updatePoints(fundPoints); umsDevelopmentFundMapper.updatePoints(fundPoints);
//积分分润逻辑
memberPointsSplitProfitService.pointsSplit(order);
} }
} }
//订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 //订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
@@ -1877,12 +1889,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
order.setPaymentTime(date); order.setPaymentTime(date);
orderMapper.updateByPrimaryKey(order); orderMapper.updateByPrimaryKey(order);
//会员现金分润，升级逻辑
/**
* 会员分润，升级逻辑
*/
memberSplitProfitService.updateOderAndMemberInfo(order); memberSplitProfitService.updateOderAndMemberInfo(order);
} }
} }
} }