添加优惠卷

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -11,6 +11,7 @@ public class AppUserDTO {
 	private Integer id;
 	private Integer userid;
 	private Integer isMember;
+	private String username;
 	private String nickname;
 	private String realname;
 	private String headimgurl;

ace-modules/ace-admin/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>xx-im-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-activity-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -17,6 +17,7 @@ import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
+import com.xxfc.platform.activity.Feign.ActivityFeign;
 import com.xxfc.platform.im.feign.ImFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import lombok.extern.slf4j.Slf4j;
@@ -51,6 +52,9 @@ public class AppPermissionService {
     @Autowired
     ImFeign imFeign;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
     private BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(12);
     @Autowired
     private RedisTemplate userRedisTemplate;
@@ -219,6 +223,8 @@ public class AppPermissionService {
             rsUserDetail.setIsdel(0);
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.error("注册：新增用户详情： " + userid);
+             //自动登录获取优惠卷
+            authCoupn(userid);
             // 登录结果要做做统一处理
             JSONObject data = autoLogin(userid, username, headimgurl, nickname);
             // 到im注册，获取返回结果
@@ -625,6 +631,10 @@ public class AppPermissionService {
         log.error("------im登录----access_token======"+access_token);
         return access_token;
     }
+    //自动领取新人优惠卷
+    public  String authCoupn(Integer userId){
+        return  activityFeign.led(userId);
+    }
 
 
 }

xx-activity/xx-activity-api/pom.xml

@@ -17,6 +17,12 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-universal-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/Feign/ActivityFeign.java

+package com.xxfc.platform.activity.Feign;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-21 8:11
+ */
+@FeignClient(value = "xx-activity")
+public interface ActivityFeign {
+
+    @ApiOperation("用户自动领取新人卷")
+    @RequestMapping(value = "/user/auth/led", method = RequestMethod.POST)
+    public String led(@RequestParam(value = "userId") Integer userId);
+
+}

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

@@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
+import com.xxfc.platform.activity.constant.CouponUsed;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.entity.UserCoupon;
+import com.xxfc.platform.universal.weixin.util.Snowflake;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,6 +15,8 @@ import com.xxfc.platform.activity.mapper.UserCouponMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.List;
+
 /**
  * 我的优惠卷
  *
@@ -29,19 +33,32 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
     private  CouponBiz couponBiz;
 
     //自动发送优惠卷
-    public ObjectRestResponse authledCoupon(Integer userId){
+    public String authledCoupon(Integer userId){
         if (userId==null||userId==0){
-            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+            log.error("----参数不能为空");
+            return  null;
         }
-        Coupon coupon=couponBiz.getCouponByUsed(userId);
+        Coupon coupon=couponBiz.getCouponByUsed(CouponUsed.ALLNEW.getCode());
         if (coupon==null){
             log.error(userId+"----无可领取优惠卷");
-            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无可领取优惠卷");
+            return  null;
         }
         Integer couponId=coupon.getId();
         Example example=new Example(UserCoupon.class);
         example.createCriteria().andEqualTo("userId",userId).andEqualTo("couponId",couponId);
-        return  ObjectRestResponse.succ();
+        List<UserCoupon> list=selectByExample(example);
+        if(list.size()>0){
+            log.error(userId+"----已领优惠卷");
+            return  null;
+        }
+        String ticker_no=Snowflake.build()+"";
+        UserCoupon userCoupon=new UserCoupon();
+        userCoupon.setUserId(userId);
+        userCoupon.setCouponId(couponId);
+        userCoupon.setTickerNo(ticker_no);
+        insertSelective(userCoupon);
+        return  ticker_no;
 
     }
+
 }
\ No newline at end of file

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

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.UserCouponBiz;
 import com.xxfc.platform.activity.entity.UserCoupon;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("userCoupon")
+@RequestMapping("user")
 public class UserCouponController extends BaseController<UserCouponBiz, UserCoupon> {
 
+
+    @ApiOperation("用户自动领取新人卷")
+    @RequestMapping(value = "/auth/led", method = RequestMethod.POST)
+    public String led(@RequestParam(value = "userId",defaultValue = "0") Integer userId) {
+        return baseBiz.authledCoupon(userId);
+    }
+
 }
\ No newline at end of file