|
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.util.RandomUtil;
|
|
import cn.hutool.core.util.RandomUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.crypto.SecureUtil;
|
|
import cn.hutool.crypto.SecureUtil;
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.txz.cif.configurer.LocalUtil;
|
|
import com.txz.cif.configurer.LocalUtil;
|
|
@@ -16,6 +17,7 @@ import com.txz.cif.enums.RedEnvelopeStatusEnum;
|
|
import com.txz.cif.enums.WithdrawStatusEnum;
|
|
import com.txz.cif.enums.WithdrawStatusEnum;
|
|
import com.txz.cif.model.ConfigMember;
|
|
import com.txz.cif.model.ConfigMember;
|
|
import com.txz.cif.model.User;
|
|
import com.txz.cif.model.User;
|
|
|
|
+import com.txz.cif.param.OrderParam;
|
|
import com.txz.cif.service.ConfigMemberService;
|
|
import com.txz.cif.service.ConfigMemberService;
|
|
import com.txz.cif.service.RedEnvelopeService;
|
|
import com.txz.cif.service.RedEnvelopeService;
|
|
import com.txz.cif.service.SequenceService;
|
|
import com.txz.cif.service.SequenceService;
|
|
@@ -25,10 +27,7 @@ import com.txz.cif.util.UserNoUtil;
|
|
import com.txz.cif.web.bo.EnumBo;
|
|
import com.txz.cif.web.bo.EnumBo;
|
|
import com.txz.cif.web.bo.UserBo;
|
|
import com.txz.cif.web.bo.UserBo;
|
|
import com.txz.cif.web.bo.UserInfoBO;
|
|
import com.txz.cif.web.bo.UserInfoBO;
|
|
-import com.txz.cif.web.para.LoginAccountParameters;
|
|
|
|
-import com.txz.cif.web.para.MyUserParam;
|
|
|
|
-import com.txz.cif.web.para.RegisterAccountParameters;
|
|
|
|
-import com.txz.cif.web.para.UserInfoForm;
|
|
|
|
|
|
+import com.txz.cif.web.para.*;
|
|
import com.txz.operating.dto.ConfigDTO;
|
|
import com.txz.operating.dto.ConfigDTO;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -41,6 +40,7 @@ import tk.mybatis.mapper.entity.Example;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.math.RoundingMode;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -72,7 +72,9 @@ public class UserApiController extends AbstractApiController {
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private OperatingConfigDubboServiceClient configDubboServiceClient;
|
|
private OperatingConfigDubboServiceClient configDubboServiceClient;
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
@GetMapping("/getEnum")
|
|
@GetMapping("/getEnum")
|
|
@ApiOperation(value = "获取枚举(1业务类型 2充值状态 3提现状态 4收益状态 5收益业务类型)", httpMethod = "GET")
|
|
@ApiOperation(value = "获取枚举(1业务类型 2充值状态 3提现状态 4收益状态 5收益业务类型)", httpMethod = "GET")
|
|
public Result<List<EnumBo>> getEnum(@RequestParam Integer id) {
|
|
public Result<List<EnumBo>> getEnum(@RequestParam Integer id) {
|
|
@@ -348,6 +350,20 @@ public class UserApiController extends AbstractApiController {
|
|
if (puser.getPid() != null) {
|
|
if (puser.getPid() != null) {
|
|
user.setPpid(puser.getPid());
|
|
user.setPpid(puser.getPid());
|
|
}
|
|
}
|
|
|
|
+ //TODO 直推红包
|
|
|
|
+
|
|
|
|
+ try{}catch (Exception)
|
|
|
|
+ com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = configDubboServiceClient.getConfigByCode("invited_amount");
|
|
|
|
+ log.info("operatingConfigDubboServiceClient.getConfigByCode openRedEnvelopeRate:"+ JSONObject.toJSONString(openRedEnvelopeRate));
|
|
|
|
+ String amountStr = openRedEnvelopeRate.getData().getValueInfo();
|
|
|
|
+ BigDecimal amount = new BigDecimal(amountStr).setScale(2,RoundingMode.DOWN);
|
|
|
|
+
|
|
|
|
+ // 直推红包
|
|
|
|
+ com.txz.cif.dto.Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
|
|
|
|
+ .amount(amount).bizType(BizTypeEnum.PROMOTION_COMMISSION.getKey())
|
|
|
|
+ .userIds(CollUtil.newArrayList(OrderParam.builder().userId(puser.getId()).orderNo(params.getPhone()).build()))
|
|
|
|
+ .transTime(DateUtil.date())
|
|
|
|
+ .build());
|
|
// }
|
|
// }
|
|
}
|
|
}
|
|
if (StrUtil.isBlank(user.getHeadPic())) {
|
|
if (StrUtil.isBlank(user.getHeadPic())) {
|