|
@@ -2,7 +2,6 @@ package com.cyksj.web.controller.user;
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
-import cn.hutool.core.lang.Validator;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
|
import cn.hutool.extra.qrcode.QrConfig;
|
|
import cn.hutool.extra.qrcode.QrConfig;
|
|
@@ -21,7 +20,10 @@ import com.cyksj.mapper.manage.distribute.DistributeWaitingSendPointsMapper;
|
|
|
import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
|
|
import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
|
|
|
import com.cyksj.model.entity.*;
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.request.ApplyMoneyReq;
|
|
import com.cyksj.model.request.ApplyMoneyReq;
|
|
|
-import com.cyksj.model.views.*;
|
|
|
|
|
|
|
+import com.cyksj.model.views.DistributeMoneyApplyView;
|
|
|
|
|
+import com.cyksj.model.views.DistributePopularizeOrdersView;
|
|
|
|
|
+import com.cyksj.model.views.DistributePopularizeView;
|
|
|
|
|
+import com.cyksj.model.views.UserDistributeView;
|
|
|
import com.cyksj.web.util.StpUserUtil;
|
|
import com.cyksj.web.util.StpUserUtil;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
import com.ejlchina.searcher.SearchResult;
|
|
@@ -153,9 +155,6 @@ public class DistributePopularizeController {
|
|
|
if (ObjectUtil.hasEmpty(applyMoneyReq.getPhone(), applyMoneyReq.getRealName())) {
|
|
if (ObjectUtil.hasEmpty(applyMoneyReq.getPhone(), applyMoneyReq.getRealName())) {
|
|
|
throw BusinessRuntimeException.getInstance("必填项不能为空");
|
|
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"));
|
|
DistributePointsExchangeMoney distributePointsExchangeMoney = distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).orderByDesc(DistributePointsExchangeMoney::getPoints).last("limit 1"));
|
|
|
BigDecimal minPoints = BigDecimal.valueOf(distributePointsExchangeMoney.getMinPoints());
|
|
BigDecimal minPoints = BigDecimal.valueOf(distributePointsExchangeMoney.getMinPoints());
|
|
|
BigDecimal min = BigDecimal.valueOf(distributePointsExchangeMoney.getPoints());
|
|
BigDecimal min = BigDecimal.valueOf(distributePointsExchangeMoney.getPoints());
|