zoujiajian пре 11 месеци
родитељ
комит
3c798ebf18

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

@@ -306,13 +306,9 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		model.setOutBizNo(donNo);
 		//单位元
 		model.setTransAmount(money.divide(BigDecimal.valueOf(100)).toString());
-		model.setProductCode(ZfbProductCode.STD_RED_PACKET.getProductCode());
+		model.setProductCode(ZfbProductCode.TRANS_ACCOUNT_NO_PWD.getProductCode());
 		model.setBizScene(TransferConstant.DIRECT_TRANSFER);
 		model.setOrderTitle(remark);
-		//红包业务必传,取值REDPACKET
-		JSONObject businessParams = new JSONObject();
-		businessParams.putOpt(TransferConstant.SUB_BIZ_SCENE, TransferConstant.RED_PACKET);
-		model.setBusinessParams(businessParams.toString());
 		Participant payeeInfo = new Participant();
 		payeeInfo.setIdentity(account);
 		payeeInfo.setIdentityType(TransferConstant.ALIPAY_LOGON_ID);

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

@@ -1,9 +1,12 @@
 package com.cyksj.web.controller.cps;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.mapper.manage.distribute.DistributePointsExchangeMoneyMapper;
+import com.cyksj.model.entity.DistributePointsExchangeMoney;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.request.ApplyMoneyReq;
 import com.cyksj.model.views.CpsApplyMoneyView;
@@ -41,6 +44,8 @@ public class CpsApplyMoneyController {
 
 	private final UserMapper userMapper;
 
+	private final DistributePointsExchangeMoneyMapper distributePointsExchangeMoneyMapper;
+
 	private final HttpServletRequest request;
 
 	/**
@@ -104,4 +109,12 @@ public class CpsApplyMoneyController {
 		applyMoneyReq.setUserId(cpsUserId);
 		return transferFuncService.subApplyMoney(applyMoneyReq);
 	}
+
+	/**
+	 * 提现门槛
+	 */
+	@GetMapping("/applyMoney/threshold")
+	public Result<DistributePointsExchangeMoney> getThreshold() {
+		return GatewayResponse.SUCCESS.newBuilder().toResult(distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).last("limit 1")));
+	}
 }

+ 11 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/shop/YhShopUserController.java

@@ -8,6 +8,7 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsDonMapper;
+import com.cyksj.mapper.manage.distribute.DistributePointsExchangeMoneyMapper;
 import com.cyksj.mapper.shop.YhShopApplyRecordMapper;
 import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.model.entity.*;
@@ -57,6 +58,8 @@ public class YhShopUserController {
 
 	private final RefreshCacheService refreshCacheService;
 
+	private final DistributePointsExchangeMoneyMapper distributePointsExchangeMoneyMapper;
+
 	/**
 	 * 店铺 信息详情
 	 */
@@ -291,4 +294,12 @@ public class YhShopUserController {
 		yhShopManageService.addUserShop(yhShop);
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}
+
+	/**
+	 * 提现门槛
+	 */
+	@GetMapping("/applyMoney/threshold")
+	public Result<DistributePointsExchangeMoney> getThreshold() {
+		return GatewayResponse.SUCCESS.newBuilder().toResult(distributePointsExchangeMoneyMapper.selectOne(Wrappers.lambdaQuery(DistributePointsExchangeMoney.class).last("limit 1")));
+	}
 }