exit:新增特邀代理未完

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 import com.alibaba.druid.support.json.JSONUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
@@ -62,22 +63,6 @@ public class SmileUserController extends BaseController {
         return AjaxResult.success(userListByOrgId);
     }
 
-    @PostMapping("/updateUserStateByUid")
-    @ApiOperation(value = "根据uid修改用户状态 0：正常，1：黑名单")
-    @ResponseBody
-    public AjaxResult updateUserStateById(SaveUserStateParam saveUserStateParam) {
-        return iSmileUserService.updateUserStateById(saveUserStateParam.getUid(), saveUserStateParam.getState());
-    }
-
-    @PostMapping("/listByState")
-    @ApiOperation("获取黑名单列表")
-    @ResponseBody
-    public TableDataInfo listByState(SmileUserStateParam smileUserStateParam) {
-        PageHelper.startPage(smileUserStateParam.getPageNum(), smileUserStateParam.getPageSize());
-        return getDataTable(iSmileUserService.listByState(smileUserStateParam));
-    }
-
-
     @PostMapping("/check/list")
     @ApiOperation("获取审核列表")
     @ResponseBody
@@ -97,6 +82,33 @@ public class SmileUserController extends BaseController {
         return iSmileUserService.updateUserCheckById(smileUserCheckVo);
     }
 
+    @PostMapping("/updateUserStateByUid")
+    @ApiOperation(value = "根据uid修改用户状态 0：正常，1：黑名单")
+    @ResponseBody
+    @ApiOperationSupport(order = 1)
+    public AjaxResult updateUserStateById(SaveUserStateParam saveUserStateParam) {
+        return iSmileUserService.updateUserStateById(saveUserStateParam.getUid(), saveUserStateParam.getState());
+    }
+
+    @PostMapping("/listByState")
+    @ApiOperation("获取黑名单列表")
+    @ResponseBody
+    @ApiOperationSupport(order = 2)
+    public TableDataInfo listByState(SmileUserStateParam smileUserStateParam) {
+        PageHelper.startPage(smileUserStateParam.getPageNum(), smileUserStateParam.getPageSize());
+        return getDataTable(iSmileUserService.listByState(smileUserStateParam));
+    }
+
+    @PostMapping("/saveInvitedAgent")
+    @ApiOperation("新增特邀代理")
+    @ResponseBody
+    @ApiOperationSupport(order = 3)
+    public AjaxResult saveInvitedAgent(SmileUserInvitedVo smileUserInvitedVo) {
+//        iSmileUserService.saveInvitedAgent(smileUserInvitedVo);
+        return AjaxResult.success();
+    }
+
+
     @RequestMapping("getAreaJson")
     @ApiOperation("省市区json")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SaveUserStateParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author TT
+ */
+@Data
+public class SaveUserStateParam {
+
+    @ApiModelProperty(value = "uid", example = "")
+    private String uid;
+
+    @ApiModelProperty(value = "标识【0：正常；1：黑名单】", example = "1")
+    @NotNull(message = "标识不能为空")
+    private Integer state;
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserInvitedVo.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @author TT
+ */
+@Data
+public class SmileUserInvitedVo {
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号", example = "")
+    private String phone;
+
+    @ApiModelProperty(value = "代理描述")
+    private String describe;
+
+    @ApiModelProperty(value = "演出id")
+    private String performancesId;
+
+    @ApiModelProperty(value = "票提")
+    private BigDecimal ticket;
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserStateParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author TT
+ */
+@Data
+public class SmileUserStateParam {
+
+    @ApiModelProperty(value = "手机号", example = "")
+    private String phone;
+
+    @ApiModelProperty(value = "代理类型（1：总代，2：普代）", example = "")
+    private Integer type;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "页数", example = "")
+    @NotNull(message = "页数不能为空")
+    private Integer pageNum;
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java

@@ -26,4 +26,7 @@ public interface ISmileUserService extends IService<SmileUser> {
     AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheck);
 
     List<SmileUser> listByState(SmileUserStateParam smileUserStateParam);
+
+    AjaxResult saveInvitedAgent(SmileUserInvitedVo smileUserInvitedVo);
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 import com.liquidnet.service.smile.entity.SmileSchool;
@@ -24,6 +25,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -205,6 +208,35 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         return smileUserMapper.selectList(lambdaQueryWrapper);
     }
 
+    @Override
+    public AjaxResult saveInvitedAgent(SmileUserInvitedVo smileUserInvitedVo) {
+        //票提转换%-》0.00
+        BigDecimal ticket = smileUserInvitedVo.getTicket().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
+        //生成uid
+        String uid = IDGenerator.nextMilliId2();
+        SmileUser smileUser = SmileUser.getNew();
+        smileUser.setUid(uid);
+        smileUser.setName(smileUserInvitedVo.getName());
+        smileUser.setPhone(smileUserInvitedVo.getPhone());
+        smileUser.setIntroduce(smileUserInvitedVo.getDescribe());
+        smileUser.setDelTag(0);
+        smileUser.setType(5);
+        int insert = smileUserMapper.insert(smileUser);
+        if (insert > 0) {
+            //新增缓存
+            SmileUserVO smileUserVO = new SmileUserVO();
+            smileUserVO.setUid(smileUser.getUid());
+            smileUserVO.setPhone(smileUser.getPhone());
+            smileUserVO.setDelTag(0);
+            smileUserVO.setState(0);
+            smileUserVO.setIntroduce(smileUser.getIntroduce());
+            smileUserVO.setType(5);
+            smileUserVO.setAgentId(uid);
+            smileRedisUtils.setSmileUserVo(uid, smileUserVO);
+        }
+        return null;
+    }
+
     private void updateUserVoRedis(SmileUserCheckVo smileUserCheckVo, SmileOrganization smileOrganization) {
         LambdaQueryWrapper<SmileUser> smileUserQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         smileUserQueryWrapper.eq(SmileUser::getOrgId, smileOrganization.getId());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

@@ -42,70 +42,70 @@ public class SmileRedisUtils {
      * redis保存用户
      */
     public void setSmileUserVO(String uid, SmileUserVO smileUserVO) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
+        getRedis().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
     }
 
     /**
      * redis获取SmileUserVO
      */
     public SmileUserVO getSmileUserVO(String uid) {
-        return (SmileUserVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_USER.concat(uid));
+        return (SmileUserVO) getRedis().get(SmileRedisConst.SMILE_USER.concat(uid));
     }
 
     /**
      * 根据学校id获取学校名称
      */
     public String getSchoolNameById(String schoolId) {
-        return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        return (String) getRedis().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 根据学校id删除学校
      */
     public void delSchoolNameById(String schoolId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 保存/更新学校
      */
     public void setSchool(String schoolId, String schoolName) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
+        getRedis().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
     }
 
     /**
      * 保存全部学校
      */
     public void setSchoolAll(List<SmileSchoolVo> smileSchoolVos) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
+        getRedis().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
     }
 
     /**
      * 删除缓存学校集合
      */
     public void delSchoolAll() {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL);
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
      * 获取全部学校
      */
     public List<SmileSchoolVo> getSchoolAll() {
-       return (List<SmileSchoolVo>)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL);
+       return (List<SmileSchoolVo>)getRedis().get(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
      * 删除学校
      */
     public void delSchool(String schoolId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 获取演出打款状态
      */
     public String getShowStatus(String performancesId) {
-        return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
+        return (String) getRedis().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
     }
 
 
@@ -115,16 +115,15 @@ public class SmileRedisUtils {
      */
     public void setUserDataByUid(UserData userData, String perId) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(userData.getUid());
-        redisDataSourceUtil.getRedisSweetUtil().set(key, userData, 60 * 60 * 24);
+        getRedis().set(key, userData, 60 * 60 * 24);
     }
 
     /**
      * 获取用户最新计算数据
-     * @param userData
      */
     public UserData getUserDataByUid(String perId,String uid) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(uid);
-        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        Object obj = getRedis().get(key);
         if (obj==null){
             return null;
         }else {
@@ -136,7 +135,7 @@ public class SmileRedisUtils {
      * 保存演出ids
      */
     public void setShowIds(List<String> perId) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
+        getRedis().set(SmileRedisConst.SMILE_SHOW, perId);
     }
 
     /**
@@ -177,75 +176,75 @@ public class SmileRedisUtils {
      * 保存个人打款
      */
     public void setPriceByUid(String performancesId, String uid) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
+        getRedis().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
     }
 
     /**
      * 获取个人打款状态
      */
     public Integer getShowPriceUid(String performancesId, String uid) {
-        return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
+        return (Integer) getRedis().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
     }
 
     /**
      * 删除个人打款状态
      */
     public void delPriceByUid(String performancesId, String uid) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
+        getRedis().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
     }
 
     /**
      * 总共演出打款
      */
     public void setShowPriceId(String performancesId) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
+        getRedis().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
     }
 
     /**
      * 总共演出打款删除
      */
     public void delShowPriceId(String performancesId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+        getRedis().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
     }
 
     /**
      * 获取演出打款状态
      */
     public Integer getShowPriceId(String performancesId) {
-        return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+        return (Integer) getRedis().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
     }
 
     /**
      * 获取用户数据
      */
     public SmileSellDataVO getSellDataVO(String uid, String performancesId) {
-        return (SmileSellDataVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
+        return (SmileSellDataVO) getRedis().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
     }
 
     /**
      * 保存票提
      */
     public void setAgent(String performancesId, String ticketId, SmileAgentVo smileAgentVo) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
+        getRedis().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
     }
 
     public SmileAgentVo getAgent(String performanceId, String ticketId) {
-        return (SmileAgentVo) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
+        return (SmileAgentVo) getRedis().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
     }
 
     /**
      * 删除票提记录
      */
     public void delAgent(String performancesId, String ticketId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId));
+        getRedis().del(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId));
     }
 
     public BigDecimal getUserTotalPrice(String uid) {
-        return (redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
+        return (getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
     }
 
     public void setUserTotalPrice(String uid, BigDecimal add) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
+        getRedis().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
     }
 
     // 覆盖活动详情
@@ -325,15 +324,14 @@ public class SmileRedisUtils {
      */
     public void setShowVoByPerId(ShowVo vo) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(vo.getPerformancesId());
-        redisDataSourceUtil.getRedisSweetUtil().set(key,vo);
+        getRedis().set(key,vo);
     }
     /**
      * 获取演出列表vo
-     * @param vo
      */
     public ShowVo getShowVoByPerId(String perId) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(perId);
-        Object o = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        Object o = getRedis().get(key);
         if (o==null){
             return null;
         }else {
@@ -341,4 +339,13 @@ public class SmileRedisUtils {
         }
     }
 
+    /* ---------------------------------------- smileUser ---------------------------------------- */
+    public SmileUserVO getSmileUserVo(String userId) {
+        return (SmileUserVO) getRedis().get(SmileRedisConst.SMILE_USER.concat(userId));
+    }
+
+    public void setSmileUserVo(String userId, SmileUserVO smileUserVORedis) {
+        getRedis().set(SmileRedisConst.SMILE_USER.concat(userId), smileUserVORedis);
+    }
+
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -184,4 +184,13 @@ public class SmileUser implements Serializable {
 
     private LocalDateTime updatedDate;
 
+    private static final SmileUser obj = new SmileUser();
+
+    public static SmileUser getNew() {
+        try {
+            return (SmileUser) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmileUser();
+        }
+    }
 }