Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -2,6 +2,8 @@ package com.xxfc.platform.activity.biz;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.ActivityRule;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,11 +55,11 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity
     }
 
     //领取优惠卷
-    public  void  receiveCoupn(Integer userId) {
+    public ObjectRestResponse receiveCoupn(Integer userId) {
         ActivityRule rule = ruleBiz.getActity();
         if (rule == null) {
             log.error("----没有开启的活动----");
-            return;
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"没有开启的活动");
         }
         Integer activityId = rule.getId();
         ActivityUserJoin userJoin = new ActivityUserJoin();
@@ -66,11 +68,11 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity
         userJoin= selectOne(userJoin);
         if (userJoin == null ) {
             log.error("----用户没有此参与活动----userId====" + userId);
-            return;
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"不是新用户,无法参与此活动");
         }
         if(userJoin.getStatus()!=0){
             log.error("----用户已领取----userId====" + userId);
-            return;
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"用户已领取");
         }
         String value=rule.getValue();
         JSONObject json=JSONObject.parseObject(value);
@@ -88,6 +90,7 @@ public class ActivityUserJoinBiz extends BaseBiz<ActivityUserJoinMapper,Activity
         }
         userJoin.setStatus(1);
         updateById(userJoin);
+        return ObjectRestResponse.succ();
     }
 
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -82,8 +82,7 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
         if (userId == null) {
             return ObjectRestResponse.createDefaultFail();
         }
-        joinBiz.receiveCoupn(userId);
-        return ObjectRestResponse.succ();
+        return  joinBiz.receiveCoupn(userId);
     }