修改分润人与购买人相同记录分润人信息，不分润

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -281,9 +281,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         orderReq.setOrderNo(Long.toString(orderNo));
 
         //分润人为自己,不是分润订单
-        if (null != orderReq.getRecomUserId() && orderReq.getUserId().equals(orderReq.getRecomUserId())) {
-            orderReq.setRecomUserId(null);
-        }
+        // if (null != orderReq.getRecomUserId() && orderReq.getUserId().equals(orderReq.getRecomUserId())) {
+        //     orderReq.setRecomUserId(null);
+        // }
 
         //验证参数,必须验证参数
         BigDecimal actualPrice = BigDecimal.ZERO;
@@ -872,9 +872,10 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             }
             platformCashAccountRecordService.save(platformCashAccountRecord);
 
-            //卖家不能分润自己
+            //卖家不能分润自己 买家和分润人相同，不分润
             if (null != orderDetailVo.getRecomUserId()
-                    && !orderDetailVo.getRecomUserId().equals(orderDetailVo.getMerchId())) {
+                    && !orderDetailVo.getRecomUserId().equals(orderDetailVo.getMerchId())
+                    && !orderDetailVo.getUserId().equals(orderDetailVo.getRecomUserId())) {
                 //获取分润收益费率
                 BigDecimal shareFeeRate = getShareFreeByGoodType(orderDetailVo.getGoodType()
                         , orderDetailVo.getBizId());