Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/Activity.java

@@ -182,5 +182,7 @@ public class Activity implements Serializable {
 	@ApiModelProperty(value = "删除（0正常，1删除）")
     private Integer isDel;
 	
-
+	@Column(name = "is_see")
+	@ApiModelProperty(value = "是否可见0可见，1不可见")
+	private Integer isSee;
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityVo.java

@@ -22,4 +22,8 @@ import java.math.BigDecimal;
 @Data
 public class ActivityVo extends Activity {
 
+    private String username;
+    private String nickname;
+    private String headimgurl;
+    private String realname;
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityBiz.java

 package com.xxfc.platform.activity.biz;
 
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -7,12 +9,15 @@ import com.xxfc.platform.activity.dto.ActivityDTO;
 import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
 import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import com.xxfc.platform.activity.vo.ActivityVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.activity.entity.Activity;
 import com.xxfc.platform.activity.mapper.ActivityMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.util.List;
+
 /**
  * 峰会活动表
  *
@@ -22,6 +27,8 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
+    @Autowired
+    private UserFeign userFeign;
 
     public ObjectRestResponse<PageDataVO<ActivityVo>> getAllByPage(ActivityDTO activityDTO) {
         Integer page = activityDTO.getPage() == null ? 1 : activityDTO.getPage();
@@ -30,6 +37,17 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         activityDTO.setLimit(limit);
         Query query = new Query(activityDTO);
         PageDataVO<ActivityVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllByPage(query.getSuper()));
+        List<ActivityVo>list = pageDataVO.getData();
+        for(ActivityVo activityVo : list){
+            if(activityVo.getCtrUser() != null && activityVo.getCtrUser() > 0){
+                ObjectRestResponse<AppUserDTO> data = userFeign.userDetailById(activityVo.getCtrUser());
+                AppUserDTO appUserDTO = data.getData();
+                activityVo.setHeadimgurl(appUserDTO.getHeadimgurl());
+                activityVo.setNickname(appUserDTO.getNickname());
+                activityVo.setRealname(appUserDTO.getRealname());
+                activityVo.setUsername(appUserDTO.getUsername());
+            }
+        }
         return ObjectRestResponse.succ(pageDataVO);
     }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityMapper.xml

@@ -28,10 +28,12 @@
         <result property="ctrUser" column="ctr_user"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
+        <result property="isSee" column="is_see"/>
     </resultMap>
 
     <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityVo" parameterType="Map">
-        select * from `activity` where 1=1
+        select * from `activity`
+         where 1=1
         <if test="goodsType != null">
             and `goods_type`=#{goodsType}
         </if>