|
|
@@ -1,5 +1,7 @@
|
|
|
package com.cyksj.web.controller.user;
|
|
|
|
|
|
+import cn.hutool.core.lang.Validator;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
|
import cn.hutool.extra.qrcode.QrConfig;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
@@ -14,6 +16,7 @@ import com.cyksj.mapper.UserMapper;
|
|
|
import com.cyksj.mapper.manage.distribute.DistributeMoneyApplyMapper;
|
|
|
import com.cyksj.mapper.manage.distribute.DistributePointsExchangeMoneyMapper;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
+import com.cyksj.model.request.ApplyMoneyReq;
|
|
|
import com.cyksj.model.views.DistributeMoneyApplyView;
|
|
|
import com.cyksj.model.views.DistributeOrdersView;
|
|
|
import com.cyksj.model.views.DistributePopularizeOrdersView;
|
|
|
@@ -26,10 +29,7 @@ import com.ejlchina.searcher.param.Operator;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
@@ -112,12 +112,18 @@ public class DistributePopularizeController {
|
|
|
@NoSubmit
|
|
|
@PostMapping("/post/applyMoney")
|
|
|
@Transactional(rollbackFor = Throwable.class)
|
|
|
- public Result<String> applyMoney() {
|
|
|
+ public Result<String> applyMoney(@RequestBody ApplyMoneyReq applyMoneyReq) {
|
|
|
Long userId = StpUserUtil.getLoginIdAsLong();
|
|
|
User user = userMapper.selectById(userId);
|
|
|
if (user == null) {
|
|
|
throw BusinessRuntimeException.getInstance("请先授权登录");
|
|
|
}
|
|
|
+ if (ObjectUtil.hasEmpty(applyMoneyReq.getPhone(), applyMoneyReq.getRealName())) {
|
|
|
+ throw BusinessRuntimeException.getInstance("必填项不能为空");
|
|
|
+ }
|
|
|
+ if (!Validator.isMobile(applyMoneyReq.getPhone())) {
|
|
|
+ throw BusinessRuntimeException.getInstance("请输入正确手机号");
|
|
|
+ }
|
|
|
DistributePointsExchangeMoney distributePointsExchangeMoney = distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).orderByDesc(DistributePointsExchangeMoney::getPoints).last("limit 1"));
|
|
|
BigDecimal min = BigDecimal.valueOf(distributePointsExchangeMoney.getPoints());
|
|
|
if (user.getPoints().compareTo(min) < 0) {
|