下级渠道提现

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -270,4 +270,8 @@ public interface Constant {
 	BigDecimal TWO_THOUSAND = BigDecimal.valueOf(200000);
 
 	Long CALUDE_GOODS_ID = 73l;
+
+	String APPLY_MONEY_DS = "分销提现";
+
+	String APPLY_MONEY_SUB = "邀请奖励金提现";
 }

netflix-dao/src/main/java/com/cyksj/mapper/UserMapper.java

@@ -67,4 +67,7 @@ public interface UserMapper extends BaseMapper<User> {
 	Integer selectUnBindUserNum();
 
     Integer getLargeNewConsumer(@Param("beginOfDay") DateTime beginOfDay, @Param("largeLimit") String largeLimit);
+
+    @Update("update user set sub_apply_money = sub_apply_money - #{needApplyMoney} where id = #{id} and sub_apply_money >= #{needApplyMoney} and sub_apply_money > 0")
+    Integer suUserSubApplyMoney(@Param("id") Long id, @Param("needApplyMoney") BigDecimal needApplyMoney);
 }

netflix-dao/src/main/java/com/cyksj/model/request/ApplyMoneyReq.java

@@ -17,6 +17,11 @@ public class ApplyMoneyReq {
 
 	private DistributeMoneyApply.Type type;
 
+	/**
+	 * 功能类型
+	 */
+	private DistributeMoneyApply.MType mType;
+
 	private String realName;
 
 	/**

netflix-service/src/main/java/com/cyksj/service/pay/TransferFuncService.java

@@ -29,4 +29,6 @@ public interface TransferFuncService {
 	 * 支付宝红包转账
 	 */
 	AlipayResponse transferAccounts(TransferAccountsReq transferAccountsReq) throws Exception;
+
+	Result<String> subApplyMoney(ApplyMoneyReq applyMoneyReq) throws Exception;
 }

netflix-service/src/main/java/com/cyksj/service/pay/impl/TransferFuncServiceImpl.java

@@ -10,6 +10,7 @@ import com.alipay.api.AlipayResponse;
 import com.alipay.api.domain.AlipayFundTransUniTransferModel;
 import com.alipay.api.domain.Participant;
 import com.alipay.api.request.AlipayFundTransUniTransferRequest;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.EnvCommonService;
 import com.cyksj.common.constant.Constant;
@@ -75,112 +76,8 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 
 	@Override
 	public Result distributeApply(ApplyMoneyReq applyMoneyReq) throws Exception {
-		Long userId = applyMoneyReq.getUserId();
-		User user = userMapper.selectById(userId);
-		if (user == null) {
-			throw BusinessRuntimeException.getInstance("请先授权登录");
-		}
-		if (user.getIsBlack()) throw BusinessRuntimeException.getInstance("系统检测操作异常，请稍后再试");
-		Boolean isTakeAll = applyMoneyReq.getIsTakeAll();
-		DistributeMoneyApply.Type type = applyMoneyReq.getType();
-		if (type == null) type = DistributeMoneyApply.Type.zfb;
-		if (type == DistributeMoneyApply.Type.zfb) {
-			if (ObjectUtil.hasEmpty(applyMoneyReq.getAccount(), applyMoneyReq.getRealName())) {
-				throw BusinessRuntimeException.getInstance("必填项不能为空");
-			}
-			if (applyMoneyReq.getAccount().length() > 255 || applyMoneyReq.getRealName().length() > 32) {
-				throw BusinessRuntimeException.getInstance("请输入正确的账户信息");
-			}
-		}
-		if (type == DistributeMoneyApply.Type.usdt) {
-			if (StrUtil.isEmpty(applyMoneyReq.getWalletAddr())) {
-				throw BusinessRuntimeException.getInstance("USDT提现钱包地址不能为空");
-			}
-			if (applyMoneyReq.getWalletAddr().length() > 1000) {
-				throw BusinessRuntimeException.getInstance("请输入正确的钱包地址");
-			}
-			if (StrUtil.isNotBlank(applyMoneyReq.getRemark()) && applyMoneyReq.getRemark().length() > 512) {
-				throw BusinessRuntimeException.getInstance("备注过多");
-			}
-			isTakeAll = true;
-
-		}
-		DistributeMoneyApply distributeMoneyApply = null;
-		if (type == DistributeMoneyApply.Type.pwdRed) {
-			distributeMoneyApply = userDistributeMapper.selectRelationBusiness(userId);
-			isTakeAll = true;
-		}
-		BigDecimal userPoints = user.getPoints();
-		DistributePointsExchangeMoney distributePointsExchangeMoney = distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).orderByDesc(DistributePointsExchangeMoney::getPoints).last("limit 1"));
-		BigDecimal minPoints = BigDecimal.valueOf(distributePointsExchangeMoney.getMinPoints());
-		BigDecimal ratePoints = BigDecimal.valueOf(distributePointsExchangeMoney.getPoints());
-		BigDecimal minMoney = distributePointsExchangeMoney.getMoney();
-		if (userPoints.compareTo(minPoints) < 0) {
-			throw BusinessRuntimeException.getInstance("您当前积分未达到积分门槛,无法提现");
-		}
-//		//今日是否已提现
-//		DistributeMoneyApply apply = distributeMoneyApplyMapper.selectOne(Wrappers.lambdaQuery(DistributeMoneyApply.class).eq(DistributeMoneyApply::getUserId, userId).between(DistributeMoneyApply::getCreatedTime, DateUtil.beginOfDay(DateTime.now()), DateUtil.endOfDay(DateTime.now())).last("limit 1"));
-//		if (apply != null) {
-//			throw BusinessRuntimeException.getInstance("今日已提现,请明日再进行操作");
-//		}
-		BigDecimal num = userPoints.divide(ratePoints, 0, RoundingMode.DOWN);
-		BigDecimal needApplyMoney = num.multiply(minMoney);
-		BigDecimal needSubPoints = num.multiply(ratePoints);
-		BigDecimal fourHundred = BigDecimal.valueOf(4 * 100 * 100);
-		if (isTakeAll == null || !isTakeAll) {
-			if (needApplyMoney.compareTo(fourHundred) > 0) {
-				needApplyMoney = fourHundred;
-				needSubPoints = fourHundred.divide(minMoney).multiply(ratePoints);
-			}
-		}
-		Integer update = userMapper.subPoints(user.getId(), needSubPoints);
-		if (update == 1) {
-			distributeMoneyApply = Optional.ofNullable(distributeMoneyApply).orElse(new DistributeMoneyApply());
-			distributeMoneyApply.setUserId(userId);
-			distributeMoneyApply.setPoints(needSubPoints);
-			distributeMoneyApply.setMoney(needApplyMoney);
-			distributeMoneyApply.setAccount(applyMoneyReq.getAccount());
-			distributeMoneyApply.setRealName(applyMoneyReq.getRealName());
-			distributeMoneyApply.setWalletAddr(applyMoneyReq.getWalletAddr());
-			distributeMoneyApply.setRemark(applyMoneyReq.getRemark());
-			distributeMoneyApply.setType(applyMoneyReq.getType());
-			if (isTakeAll != null && isTakeAll) {
-				distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.verifying);
-			} else {
-				TransferAccountsReq req = new TransferAccountsReq();
-				req.setMoney(needApplyMoney);
-				req.setAccount(applyMoneyReq.getAccount());
-				req.setName(applyMoneyReq.getRealName());
-				req.setPoints(needSubPoints);
-				req.setUserId(userId);
-				req.setChannelType(1);
-				req.setRemark("分销提现");
-				AlipayResponse alipayResponse = transferAccounts(req);
-				if (alipayResponse.isSuccess()) {
-					distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.success);
-				} else {
-					distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.fail);
-					distributeMoneyApply.setReason(alipayResponse.getSubMsg());
-					userBenefitsService.addDistributePoints(userId, distributeMoneyApply.getPoints());
-					if (StrUtil.equals(alipayResponse.getSubCode(), "SECURITY_CHECK_FAILED")) {
-						return GatewayResponse.FAIL.newBuilder().setMsg("当前支付宝提现人数较多，请稍后再试").toResult();
-					}
-					return GatewayResponse.FAIL.newBuilder().setMsg(alipayResponse.getSubMsg()).toResult();
-				}
-			}
-			try {
-				distributeMoneyApplyMapper.insert(distributeMoneyApply);
-				//大额提现 超过400
-				if (envCommonService.isPrdEnv() && distributeMoneyApply.getVerifyStatus() == DistributeMoneyApply.Status.verifying && distributeMoneyApply.getMoney().compareTo(fourHundred) > 0) {
-					SmsUtil.sendLuoKey2Msg(Constant.ZK_MOBILE, "推广有大额提现申请【银河录像局】");
-				}
-			} catch (Exception e) {
-				userBenefitsService.addDistributePoints(userId, distributeMoneyApply.getPoints());
-				return GatewayResponse.FAIL.newBuilder().setMsg("网络错误,请重试").toResult();
-			}
-			return GatewayResponse.SUCCESS.newBuilder().toResult(distributeMoneyApply);
-		}
-		throw BusinessRuntimeException.getInstance("系统异常,请重新提交提现申请");
+		applyMoneyReq.setMType(DistributeMoneyApply.MType.ds);
+		return commonApplyMoney(applyMoneyReq);
 	}
 
 	@Override
@@ -309,7 +206,13 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		return response;
 	}
 
-	private AlipayRequest aliPayTransferAccountsRequest(String donNo, String account, String name, BigDecimal money,String remark) {
+	@Override
+	public Result<String> subApplyMoney(ApplyMoneyReq applyMoneyReq) throws Exception {
+		applyMoneyReq.setMType(DistributeMoneyApply.MType.sub);
+		return commonApplyMoney(applyMoneyReq);
+	}
+
+	private AlipayRequest aliPayTransferAccountsRequest(String donNo, String account, String name, BigDecimal money, String remark) {
 		//支付宝转账
 		AlipayFundTransUniTransferRequest transUniTransferRequest = new AlipayFundTransUniTransferRequest();
 		//转账参数
@@ -357,4 +260,125 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		Optional.ofNullable(transDate).ifPresent(transferTime -> record.setTransferTime(DateTime.of(transferTime, "yyyy-MM-dd HH:mm:ss")));
 		transferAccountsRecordMapper.insert(record);
 	}
+
+	public Result commonApplyMoney(ApplyMoneyReq applyMoneyReq) throws Exception {
+		Long userId = applyMoneyReq.getUserId();
+		User user = userMapper.selectById(userId);
+		if (user == null) {
+			throw BusinessRuntimeException.getInstance("请先授权登录");
+		}
+		if (user.getIsBlack()) throw BusinessRuntimeException.getInstance("系统检测操作异常，请稍后再试");
+		Boolean isTakeAll = applyMoneyReq.getIsTakeAll();
+		DistributeMoneyApply.Type type = applyMoneyReq.getType();
+		if (type == null) type = DistributeMoneyApply.Type.zfb;
+		if (type == DistributeMoneyApply.Type.zfb) {
+			if (ObjectUtil.hasEmpty(applyMoneyReq.getAccount(), applyMoneyReq.getRealName())) {
+				throw BusinessRuntimeException.getInstance("必填项不能为空");
+			}
+			if (applyMoneyReq.getAccount().length() > 255 || applyMoneyReq.getRealName().length() > 32) {
+				throw BusinessRuntimeException.getInstance("请输入正确的账户信息");
+			}
+		}
+		if (type == DistributeMoneyApply.Type.usdt) {
+			if (StrUtil.isEmpty(applyMoneyReq.getWalletAddr())) {
+				throw BusinessRuntimeException.getInstance("USDT提现钱包地址不能为空");
+			}
+			if (applyMoneyReq.getWalletAddr().length() > 1000) {
+				throw BusinessRuntimeException.getInstance("请输入正确的钱包地址");
+			}
+			if (StrUtil.isNotBlank(applyMoneyReq.getRemark()) && applyMoneyReq.getRemark().length() > 512) {
+				throw BusinessRuntimeException.getInstance("备注过多");
+			}
+			isTakeAll = true;
+
+		}
+		DistributeMoneyApply.MType mType = applyMoneyReq.getMType();
+		Assert.notNull(mType, "系统异常..");
+		DistributeMoneyApply distributeMoneyApply = null;
+		if (type == DistributeMoneyApply.Type.pwdRed) {
+			distributeMoneyApply = userDistributeMapper.selectRelationBusiness(userId);
+			isTakeAll = true;
+		}
+		BigDecimal userPoints = user.getPoints();
+		DistributePointsExchangeMoney distributePointsExchangeMoney = distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).orderByDesc(DistributePointsExchangeMoney::getPoints).last("limit 1"));
+		BigDecimal minPoints = BigDecimal.valueOf(distributePointsExchangeMoney.getMinPoints());
+		BigDecimal ratePoints = BigDecimal.valueOf(distributePointsExchangeMoney.getPoints());
+		BigDecimal minMoney = distributePointsExchangeMoney.getMoney();
+		if (userPoints.compareTo(minPoints) < 0) {
+			throw BusinessRuntimeException.getInstance("您当前积分未达到积分门槛,无法提现");
+		}
+//		//今日是否已提现
+//		DistributeMoneyApply apply = distributeMoneyApplyMapper.selectOne(Wrappers.lambdaQuery(DistributeMoneyApply.class).eq(DistributeMoneyApply::getUserId, userId).between(DistributeMoneyApply::getCreatedTime, DateUtil.beginOfDay(DateTime.now()), DateUtil.endOfDay(DateTime.now())).last("limit 1"));
+//		if (apply != null) {
+//			throw BusinessRuntimeException.getInstance("今日已提现,请明日再进行操作");
+//		}
+		BigDecimal num = userPoints.divide(ratePoints, 0, RoundingMode.DOWN);
+		BigDecimal needApplyMoney = num.multiply(minMoney);
+		BigDecimal needSubPoints = num.multiply(ratePoints);
+		BigDecimal fourHundred = BigDecimal.valueOf(4 * 100 * 100);
+		if (isTakeAll == null || !isTakeAll) {
+			if (needApplyMoney.compareTo(fourHundred) > 0) {
+				needApplyMoney = fourHundred;
+				needSubPoints = fourHundred.divide(minMoney).multiply(ratePoints);
+			}
+		}
+		Integer update = 0;
+		String zfbRemark = StrUtil.EMPTY;
+		if (mType == DistributeMoneyApply.MType.ds) {
+			update = userMapper.subPoints(user.getId(), needSubPoints);
+			zfbRemark = Constant.APPLY_MONEY_DS;
+		}
+		if (mType == DistributeMoneyApply.MType.sub) {
+			update = userMapper.suUserSubApplyMoney(user.getId(), needApplyMoney);
+			zfbRemark = Constant.APPLY_MONEY_SUB;
+		}
+		if (update == 1) {
+			distributeMoneyApply = Optional.ofNullable(distributeMoneyApply).orElse(new DistributeMoneyApply());
+			distributeMoneyApply.setUserId(userId);
+			distributeMoneyApply.setPoints(needSubPoints);
+			distributeMoneyApply.setMoney(needApplyMoney);
+			distributeMoneyApply.setAccount(applyMoneyReq.getAccount());
+			distributeMoneyApply.setRealName(applyMoneyReq.getRealName());
+			distributeMoneyApply.setWalletAddr(applyMoneyReq.getWalletAddr());
+			distributeMoneyApply.setRemark(applyMoneyReq.getRemark());
+			distributeMoneyApply.setType(applyMoneyReq.getType());
+			distributeMoneyApply.setMType(applyMoneyReq.getMType());
+			if (isTakeAll != null && isTakeAll) {
+				distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.verifying);
+			} else {
+				TransferAccountsReq req = new TransferAccountsReq();
+				req.setMoney(needApplyMoney);
+				req.setAccount(applyMoneyReq.getAccount());
+				req.setName(applyMoneyReq.getRealName());
+				req.setPoints(needSubPoints);
+				req.setUserId(userId);
+				req.setChannelType(1);
+				req.setRemark(zfbRemark);
+				AlipayResponse alipayResponse = transferAccounts(req);
+				if (alipayResponse.isSuccess()) {
+					distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.success);
+				} else {
+					distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.fail);
+					distributeMoneyApply.setReason(alipayResponse.getSubMsg());
+					userBenefitsService.addDistributePoints(userId, distributeMoneyApply.getPoints());
+					if (StrUtil.equals(alipayResponse.getSubCode(), "SECURITY_CHECK_FAILED")) {
+						return GatewayResponse.FAIL.newBuilder().setMsg("当前支付宝提现人数较多，请稍后再试").toResult();
+					}
+					return GatewayResponse.FAIL.newBuilder().setMsg(alipayResponse.getSubMsg()).toResult();
+				}
+			}
+			try {
+				distributeMoneyApplyMapper.insert(distributeMoneyApply);
+				//大额提现 超过400
+				if (envCommonService.isPrdEnv() && distributeMoneyApply.getVerifyStatus() == DistributeMoneyApply.Status.verifying && distributeMoneyApply.getMoney().compareTo(fourHundred) > 0) {
+					SmsUtil.sendLuoKey2Msg(Constant.ZK_MOBILE, "推广有大额提现申请【银河录像局】");
+				}
+			} catch (Exception e) {
+				userBenefitsService.addDistributePoints(userId, distributeMoneyApply.getPoints());
+				return GatewayResponse.FAIL.newBuilder().setMsg("网络错误,请重试").toResult();
+			}
+			return GatewayResponse.SUCCESS.newBuilder().toResult(distributeMoneyApply);
+		}
+		throw BusinessRuntimeException.getInstance("系统异常,请重新提交提现申请");
+	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsApplyMoneyController.java

@@ -2,19 +2,28 @@ package com.cyksj.web.controller.cps;
 
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.UserMapper;
+import com.cyksj.mapper.manage.distribute.DistributeMoneyApplyMapper;
+import com.cyksj.model.entity.User;
 import com.cyksj.model.request.ApplyMoneyReq;
 import com.cyksj.model.views.CpsApplyMoneyView;
+import com.cyksj.model.views.CpsDistributeSubView;
+import com.cyksj.model.views.UserDistributeSubDetailView;
+import com.cyksj.model.views.UserSubApplyMoneyDetailView;
 import com.cyksj.service.pay.TransferFuncService;
 import com.cyksj.web.util.StpCpsManageUser;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 
-/** cps后台/提现中心
+/**
+ * cps后台/提现中心
  * 项目名: yhlxj
  * 文件名: CpsApplyMoneyController
  * 创建者: JavaZou
@@ -28,6 +37,10 @@ public class CpsApplyMoneyController {
 
 	private final BeanSearcher beanSearcher;
 
+	private final DistributeMoneyApplyMapper distributeMoneyApplyMapper;
+
+	private final UserMapper userMapper;
+
 	private final HttpServletRequest request;
 
 	/**
@@ -52,4 +65,43 @@ public class CpsApplyMoneyController {
 						.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
+
+	/**
+	 * 渠道关于下级渠道提现详情
+	 */
+	@GetMapping("/get/sub/applyMoney/detail")
+	public Result<UserSubApplyMoneyDetailView> getSubApplyMoneyDetail() {
+		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
+		UserSubApplyMoneyDetailView userSubApplyMoneyDetailView = new UserSubApplyMoneyDetailView();
+		BigDecimal gotMoney = distributeMoneyApplyMapper.getSubGotAppyMoney(cpsUserId);
+		userSubApplyMoneyDetailView.setGotMoney(gotMoney);
+		User user = userMapper.selectById(cpsUserId);
+		userSubApplyMoneyDetailView.setCanApplyMoney(user.getSubApplyMoney());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(userSubApplyMoneyDetailView);
+	}
+
+	/**
+	 * 下级渠道数据
+	 */
+	@GetMapping("/get/sub")
+	public Result<SearchResult<CpsDistributeSubView>> getSubDistributeData() {
+		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
+		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+		builder.put("uid", String.format("user_id = %s", cpsUserId));
+		SearchResult<CpsDistributeSubView> search = beanSearcher.search(CpsDistributeSubView.class, builder.build());
+		search.getDataList().forEach(data -> {
+			data.setDetailView(beanSearcher.searchFirst(UserDistributeSubDetailView.class, MapUtils.builder().put("sid", data.getSubUserId()).build()));
+		});
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
+	/**
+	 * 下级渠道奖金提现
+	 */
+	@PostMapping("/sub")
+	public Result<String> subApplyMoney(@RequestBody ApplyMoneyReq applyMoneyReq) throws Exception {
+		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
+		applyMoneyReq.setUserId(cpsUserId);
+		return transferFuncService.subApplyMoney(applyMoneyReq);
+	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsDistribtueDataController.java

@@ -211,33 +211,4 @@ public class CpsDistribtueDataController {
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(brokenLineObjView);
 	}
-
-	/**
-	 * 渠道关于下级渠道提现详情
-	 */
-	@GetMapping("/get/sub/applyMoney/detail")
-	public Result<UserSubApplyMoneyDetailView> getSubApplyMoneyDetail() {
-		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
-		UserSubApplyMoneyDetailView userSubApplyMoneyDetailView = new UserSubApplyMoneyDetailView();
-		BigDecimal gotMoney = distributeMoneyApplyMapper.getSubGotAppyMoney(cpsUserId);
-		userSubApplyMoneyDetailView.setGotMoney(gotMoney);
-		User user = userMapper.selectById(cpsUserId);
-		userSubApplyMoneyDetailView.setCanApplyMoney(user.getSubApplyMoney());
-		return GatewayResponse.SUCCESS.newBuilder().toResult(userSubApplyMoneyDetailView);
-	}
-
-	/**
-	 * 下级渠道数据
-	 */
-	@GetMapping("/get/sub")
-	public Result<SearchResult<CpsDistributeSubView>> getSubDistributeData() {
-		long cpsUserId = StpCpsManageUser.getLoginIdAsLong();
-		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
-		builder.put("uid", String.format("user_id = %s", cpsUserId));
-		SearchResult<CpsDistributeSubView> search = beanSearcher.search(CpsDistributeSubView.class, builder.build());
-		search.getDataList().forEach(data -> {
-			data.setDetailView(beanSearcher.searchFirst(UserDistributeSubDetailView.class, MapUtils.builder().put("sid", data.getSubUserId()).build()));
-		});
-		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
-	}
 }