czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

充值改造

Browse Source
This commit is contained in:
张松
2025-09-25 14:41:09 +08:00
parent b5e6077321
commit 0acab5ce5c
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java
View File

@@ -80,8 +80,8 @@ public class VipPayController {
*/ */
@PostMapping("/recharge") @PostMapping("/recharge")
@Debounce(value = "#payParam.shopUserId") @Debounce(value = "#payParam.shopUserId")
public CzgResult<Map<String, Object>> recharge(HttpServletRequest request, @Validated @RequestBody RechargeDTO rechargeDTO) { public CzgResult<Map<String, Object>> recharge(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO rechargeDTO) {
if (rechargeDTO.getRechargeDetailId() == null && rechargeDTO.getMoney() == null) { if (rechargeDTO.getRechargeDetailId() == null && rechargeDTO.getAmount() == null) {
return CzgResult.failure("充值失败 未指定充值金额"); return CzgResult.failure("充值失败 未指定充值金额");
} }
rechargeDTO.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType")); rechargeDTO.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));

14
cash-service/order-service/src/main/java/com/czg/service/order/dto/RechargeDTO.java
View File

@@ -23,7 +23,9 @@ public class RechargeDTO {
*/ */
private Long rechargeDetailId; private Long rechargeDetailId;
@DecimalMin("0.01") @DecimalMin("0.01")
private BigDecimal money; private BigDecimal amount;
private Integer allPack;
/** /**
* 跳转地址 * 跳转地址
*/ */
@@ -39,6 +41,16 @@ public class RechargeDTO {
private String payType; private String payType;
private Long orderId;
private Integer seatNum;
/**
* 用户端 使用 全打包 或者 全不打包
*/
private Integer userAllPack;
public boolean isAllPack() {
return allPack != null && allPack == 1;
}
} }

2
cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
View File

@@ -51,9 +51,11 @@ public class VipPayParamDTO {
*/ */
private String authCode; private String authCode;
private String pwd; private String pwd;
private Long rechargeDetailId;
public boolean isAllPack() { public boolean isAllPack() {
return allPack != null && allPack == 1; return allPack != null && allPack == 1;
} }
} }

2
cash-service/order-service/src/main/java/com/czg/service/order/service/PayService.java
View File

@@ -120,5 +120,5 @@ public interface PayService {
CzgResult<Map<String, Object>> ltPayMember(String clientIP, VipMemberPayParamDTO payParam); CzgResult<Map<String, Object>> ltPayMember(String clientIP, VipMemberPayParamDTO payParam);
CzgResult<Map<String, Object>> recharge(String clientIP, RechargeDTO rechargeDTO, Long userId); CzgResult<Map<String, Object>> recharge(String clientIP, VipPayParamDTO rechargeDTO, Long userId);
} }

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@@ -424,7 +424,7 @@ public class PayServiceImpl implements PayService {
} }
@Override @Override
public CzgResult<Map<String, Object>> recharge(String clientIP, RechargeDTO rechargeDTO, Long userId) { public CzgResult<Map<String, Object>> recharge(String clientIP, VipPayParamDTO rechargeDTO, Long userId) {
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, rechargeDTO.getShopId()) ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, rechargeDTO.getShopId())
.eq(ShopUser::getUserId, userId)); .eq(ShopUser::getUserId, userId));
AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在"); AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在");
@@ -433,7 +433,7 @@ public class PayServiceImpl implements PayService {
throw new CzgException("未开启自定义充值金额"); throw new CzgException("未开启自定义充值金额");
} }
BigDecimal amount = shopRechargeService.checkRecharge(StpKit.USER.getHeadId(), rechargeDTO.getShopId(), userId, rechargeDTO.getRechargeDetailId(), rechargeDTO.getMoney()); BigDecimal amount = shopRechargeService.checkRecharge(StpKit.USER.getHeadId(), rechargeDTO.getShopId(), userId, rechargeDTO.getRechargeDetailId(), rechargeDTO.getAmount());
String payOrderNo = rechargeDTO.getPlatformType() + IdUtil.getSnowflakeNextId(); String payOrderNo = rechargeDTO.getPlatformType() + IdUtil.getSnowflakeNextId();
initOrderPayment(new OrderPayment(rechargeDTO.getShopId(), shopUser.getId(), "memberIn", payOrderNo, initOrderPayment(new OrderPayment(rechargeDTO.getShopId(), shopUser.getId(), "memberIn", payOrderNo,
"", amount, rechargeDTO.getRechargeDetailId())); "", amount, rechargeDTO.getRechargeDetailId()));