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

# Conflicts:
#	mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java

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

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