Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ApLogDTO.java

+package com.xxfc.platform.activity.dto;
+
+import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+
+/**
+ * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-05 15:23:04
+ */
+@Data
+public class ApLogDTO extends ActivityPopularizeLog {
+	ActivityPopularizeItem item;
+}

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

 package com.xxfc.platform.activity.biz;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
@@ -7,6 +8,7 @@ import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
+import com.xxfc.platform.activity.dto.ApLogDTO;
 import com.xxfc.platform.activity.dto.AwardDTO;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import com.xxfc.platform.activity.entity.ActivityPopularizeRelation;
@@ -94,13 +96,13 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                 setMinorUserId(appUserDTO.getUserid());
             }});
 
-            ActivityPopularizeLog popularizeLog = popularizeLogBiz.selectOne(new ActivityPopularizeLog(){{
+            ApLogDTO apLogDTO = popularizeLogBiz.selectOneApLogDTO(new ActivityPopularizeLog(){{
                 setUserId(majorUserId);
                 setItemId(INVITE_ITEMID);
             }});
 
             //生成任务项
-            if(null == popularizeLog){
+            if(null == apLogDTO){
                 popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog(){{
                     setItemId(INVITE_ITEMID);
                     setUserId(majorUserId);
@@ -120,17 +122,18 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
                 //检查是否满足奖励
                 if(relationBiz.selectList(new ActivityPopularizeRelation(){{
-                    setMajorUserId(appUserDTO.getUserid());
+                    setMajorUserId(majorUserId);
                     setPopularizeId(activityPopularize.getId());
                 }}).size() >= 2) {
+                    apLogDTO.setStatus(SYS_TRUE);
+                    popularizeLogBiz.updateSelectiveById(BeanUtil.toBean(apLogDTO, ActivityPopularizeLog.class));
                     activityPopularizeUser.setStatus(SYS_TRUE);
+                    activityPopularizeUser.setCurrentProgress(apLogDTO.getItem().getProgress());
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
-                    popularizeLog.setStatus(SYS_TRUE);
-                    popularizeLogBiz.updateSelectiveById(popularizeLog);
                     mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail(){{
                         setAmount(new BigDecimal("50"));
                         setSource(SOURCE_ACTIVITY);
-                        setUserId(appUserDTO.getUserid());
+                        setUserId(majorUserId);
                         setActivityId(activityPopularize.getId());
                         setActivityName(activityPopularize.getName());
                         setType(TYPE_POPULARIZE);

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

 package com.xxfc.platform.activity.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.xxfc.platform.activity.dto.ApLogDTO;
+import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
@@ -15,4 +19,18 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class ActivityPopularizeLogBiz extends BaseBiz<ActivityPopularizeLogMapper,ActivityPopularizeLog> {
+
+    @Autowired
+    ActivityPopularizeItemBiz activityPopularizeItemBiz;
+
+    public ApLogDTO selectOneApLogDTO(ActivityPopularizeLog entity){
+        ActivityPopularizeLog apl = mapper.selectOne(entity);
+        if(null != apl) {
+            ApLogDTO apLogDTO = BeanUtil.toBean(apl, ApLogDTO.class);
+            apLogDTO.setItem(activityPopularizeItemBiz.selectById(apLogDTO.getItemId()));
+            return apLogDTO;
+        }else {
+            return null;
+        }
+    }
 }
\ No newline at end of file