fix:发活动添加单位

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+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.toolset.base.exception.BizException;
@@ -33,6 +35,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);
@@ -95,7 +100,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/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