单身收益/单身用户上传微信
This commit is contained in:
parent
d1a8c32fb7
commit
94adb8c5dc
|
|
@ -6,7 +6,9 @@ import com.ruoyi.common.core.domain.Result;
|
||||||
import com.ruoyi.system.domain.TbUserMatchOrder;
|
import com.ruoyi.system.domain.TbUserMatchOrder;
|
||||||
import com.ruoyi.web.request.AdapayReq;
|
import com.ruoyi.web.request.AdapayReq;
|
||||||
import com.ruoyi.web.request.Event;
|
import com.ruoyi.web.request.Event;
|
||||||
|
import com.ruoyi.web.request.MatchRetailReq;
|
||||||
import com.ruoyi.web.response.AdapayResp;
|
import com.ruoyi.web.response.AdapayResp;
|
||||||
|
import com.ruoyi.web.response.MatchRetailResp;
|
||||||
import com.ruoyi.web.service.AdapayService;
|
import com.ruoyi.web.service.AdapayService;
|
||||||
import com.ruoyi.web.service.CallBackService;
|
import com.ruoyi.web.service.CallBackService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
|
@ -17,6 +19,7 @@ import org.springframework.util.Assert;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>开通合伙人相关接口</p>
|
* <p>开通合伙人相关接口</p>
|
||||||
|
|
@ -47,6 +50,23 @@ public class TbUserMatchOrderAppController {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ResponseBody
|
||||||
|
@PostMapping(value = "/getUserRetail")
|
||||||
|
@ApiOperation(value = "查询用户收益", response = MatchRetailResp.class)
|
||||||
|
public Result<MatchRetailResp> getUserRetail(@RequestBody MatchRetailReq matchRetailReq){
|
||||||
|
try {
|
||||||
|
MatchRetailResp resp = new MatchRetailResp();
|
||||||
|
resp.setUserId(matchRetailReq.getUserId());
|
||||||
|
resp.setTotalRetail(BigDecimal.valueOf(1351L));
|
||||||
|
resp.setMonthRetail(BigDecimal.valueOf(351L));
|
||||||
|
resp.setWaitRetail(BigDecimal.valueOf(351L));
|
||||||
|
return Result.success(resp);
|
||||||
|
}catch (Exception e){
|
||||||
|
return Result.error(e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@PostMapping(value = "/pay")
|
@PostMapping(value = "/pay")
|
||||||
@ApiOperation(value = "支付接口", response = AdapayResp.class)
|
@ApiOperation(value = "支付接口", response = AdapayResp.class)
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,9 @@ import cn.hutool.core.date.DateUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.ruoyi.common.constant.RedisConstants;
|
||||||
import com.ruoyi.common.core.domain.Result;
|
import com.ruoyi.common.core.domain.Result;
|
||||||
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.system.domain.*;
|
import com.ruoyi.system.domain.*;
|
||||||
import com.ruoyi.system.service.*;
|
import com.ruoyi.system.service.*;
|
||||||
import com.ruoyi.web.request.UserSingleRecommendReq;
|
import com.ruoyi.web.request.UserSingleRecommendReq;
|
||||||
|
|
@ -14,11 +16,13 @@ import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -45,6 +49,9 @@ public class TbUserSingleAppController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ITbUserBlockService tbUserBlockService;
|
private ITbUserBlockService tbUserBlockService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private StringRedisTemplate stringRedisTemplate;
|
||||||
|
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@PostMapping("/add")
|
@PostMapping("/add")
|
||||||
@ApiOperation(value = "填写用户信息", httpMethod = "POST")
|
@ApiOperation(value = "填写用户信息", httpMethod = "POST")
|
||||||
|
|
@ -119,7 +126,20 @@ public class TbUserSingleAppController {
|
||||||
// 1994
|
// 1994
|
||||||
tbUserSingle.setBirthdayStart(calendar.getTime());
|
tbUserSingle.setBirthdayStart(calendar.getTime());
|
||||||
}
|
}
|
||||||
PageHelper.startPage(pageNum, pageSize);
|
String alreadyCode = stringRedisTemplate.opsForValue().get(RedisConstants.SINGLE_USER_PREFIX + userSingle.getUserId());
|
||||||
|
if(StringUtils.isEmpty(alreadyCode)){
|
||||||
|
int randomPageNum = 1 + (int) (18 * Math.random());
|
||||||
|
Calendar midDay=Calendar.getInstance();
|
||||||
|
midDay.setTime(new Date());
|
||||||
|
midDay.add(Calendar.DAY_OF_MONTH,1);//将日加1
|
||||||
|
midDay.set(Calendar.HOUR_OF_DAY,0);//控制时
|
||||||
|
midDay.set(Calendar.MINUTE,0);//控制分
|
||||||
|
midDay.set(Calendar.SECOND,0);//控制秒
|
||||||
|
Integer seconds=(int)((midDay.getTime().getTime()-new Date().getTime())/1000);
|
||||||
|
alreadyCode = String.valueOf(randomPageNum);
|
||||||
|
stringRedisTemplate.opsForValue().set(RedisConstants.SINGLE_USER_PREFIX + userSingle.getUserId(), alreadyCode, seconds, TimeUnit.SECONDS);
|
||||||
|
}
|
||||||
|
PageHelper.startPage(Integer.parseInt(alreadyCode), pageSize);
|
||||||
List<TbUserSingle> list = tbUserSingleService.selectTbUserSingleList(tbUserSingle);
|
List<TbUserSingle> list = tbUserSingleService.selectTbUserSingleList(tbUserSingle);
|
||||||
list = list.stream().filter(x->!blockIds.contains(x.getUserId())).collect(Collectors.toList());
|
list = list.stream().filter(x->!blockIds.contains(x.getUserId())).collect(Collectors.toList());
|
||||||
list.forEach(model->{
|
list.forEach(model->{
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
package com.ruoyi.web.request;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@ApiModel(value = "App*媒婆收益入参")
|
||||||
|
public class MatchRetailReq {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "用户id")
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
package com.ruoyi.web.response;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@ApiModel(value = "App*媒婆收益响应")
|
||||||
|
public class MatchRetailResp {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "用户id")
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "总收益")
|
||||||
|
private BigDecimal totalRetail;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "本月收益")
|
||||||
|
private BigDecimal monthRetail;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "待提现收益")
|
||||||
|
private BigDecimal waitRetail;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -4,4 +4,6 @@ public class RedisConstants {
|
||||||
|
|
||||||
public final static String SMS_CODE_PREFIX = "SMS_CODE_";
|
public final static String SMS_CODE_PREFIX = "SMS_CODE_";
|
||||||
|
|
||||||
|
public final static String SINGLE_USER_PREFIX = "SINGLE_USER_";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue