Merge branch 'master_position'

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

+package com.github.wxiaoqi.security.admin.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 9:20
+ */
+@Data
+public class UserRelationDTO {
+
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
@@ -66,6 +67,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }
+
        /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
@@ -123,6 +125,22 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
         }
         return  ObjectRestResponse.succ();
     }
+
+    //后台关系绑定
+    public  ObjectRestResponse  adminBindRelation(UserRelationDTO relationDTO){
+        String phone=relationDTO.getPhone();
+        Integer userId=relationDTO.getUserId();
+        if (StringUtils.isBlank(phone)||userId==null||userId==0){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        AppUserLogin userLogin=appUserLoginBiz.checkeUserLogin(phone);
+        if (userLogin==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"该上级不存在");
+        }
+        Integer parentId=userLogin.getId();
+        getMyBiz().bindRelation(userId,parentId,1);
+        return  ObjectRestResponse.succ();
+    }
     //永久稳定关系
     public void foreverBind(Integer user_id ){
         AppUserRelation relation=getMyBiz().getRelationByUserId(user_id);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminUserRelationController.java

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
+import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("relation/admin")
+public class AdminUserRelationController extends BaseController<AppUserRelationBiz,AppUserRelation> {
+
+
+    @RequestMapping(value = "/bind",method = RequestMethod.POST)
+    @ApiModelProperty("后台绑定")
+    public ObjectRestResponse bind(@RequestBody UserRelationDTO relationDTO){
+        try {
+        return baseBiz.adminBindRelation(relationDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BaseException(e);
+        }
+    }
+
+
+}
\ No newline at end of file

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

@@ -25,6 +25,9 @@ public class UserCouponDTO {
     @ApiModelProperty(value = "抵扣金额")
     private BigDecimal usedAmount;
 
+    @ApiModelProperty(value = "时效")
+    private Integer validType;
+
     @ApiModelProperty(value = "0-未使用；1-已使用")
     private Integer isUse;
 

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

@@ -25,7 +25,9 @@ public class UserCouponPageVo {
     @ApiModelProperty(value = "抵扣金额")
     private BigDecimal usedAmount;
 
-
+    @ApiModelProperty(value = "时效")
+    private Integer validType;
+    
     @ApiModelProperty(value = "0-未使用；1-已使用")
     private Integer isUse;
 

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

@@ -82,6 +82,7 @@
         uc.is_use AS `isUse`,
         cp.title,
         cp.used_amount AS `usedAmount`,
+        cp.valid_type AS `validType`,
         uc.crt_time AS `crtTime`,
         uc.expire_time AS `expireTime`,
         uc.use_time AS `useTime`
@@ -94,7 +95,7 @@
         <if test="status != null">
            AND  `is_use`=#{status}
         </if>) AS `uc`
-        INNER JOIN ( SELECT `id`, `title`, `used_amount` FROM `coupon` WHERE 1=1
+        INNER JOIN ( SELECT `id`, `title`, `used_amount`,`valid_type` FROM `coupon` WHERE 1=1
         <if test="couponId != null">
             AND `id`=#{couponId}
         </if>