fix:merge

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityUserReward.java

@@ -51,6 +51,19 @@ public class ActivityUserReward implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+
+    @ApiModelProperty("奖品单位 同奖品表")
+    @TableField(value = "unit_")
+    private String unit;
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -11,6 +11,9 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
 import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
 import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
 import com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo;
+import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+import com.yonge.cooleshow.biz.dal.service.ActivityRewardService;
 import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.cooleshow.common.enums.RewardTypeEnum;
@@ -33,6 +36,9 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
     @Autowired
     private ActivityPlanService activityPlanService;
 
+    @Autowired
+    private ActivityRewardService activityRewardService;
+
 	@Override
     public ActivityUserRewardVo detail(Long id) {
         return baseMapper.detail(id);
@@ -100,7 +106,11 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
 
     @Override
     public void saveRewardRecord(Long activityId, Long rewardId, Long userId) {
+        ActivityReward activityReward = activityRewardService.getById(activityId);
         ActivityUserReward activityUserReward = new ActivityUserReward();
+        if (activityReward != null) {
+            activityUserReward.setUnit(activityReward.getUnit().getCode());
+        }
         activityUserReward.setActivityId(activityId);
         activityUserReward.setRewardId(rewardId);
         activityUserReward.setUserId(userId);

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());

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityUserRewardMapper.xml

@@ -7,6 +7,7 @@
         <result column="biz_id_" property="bizId" />
         <result column="user_id_" property="userId" />
         <result column="reward_id_" property="rewardId" />
+        <result column="unit_" property="unit" />
         <result column="grant_flag_" property="grantFlag" />
         <result column="receive_flag_" property="receiveFlag" />
         <result column="create_time_" property="createTime" />
@@ -20,6 +21,7 @@
         , t.biz_id_ as bizId
         , t.user_id_ as userId
         , t.reward_id_ as rewardId
+        , t.unit_ as unit
         , t.grant_flag_ as grantFlag
         , t.receive_flag_ as receiveFlag
         , t.create_time_ as createTime