src/main/java/cc/mrbird/febs/mall/dto/ApiRechargeWalletDto.java
@@ -16,6 +16,9 @@ @ApiModelProperty(value = "充值金额", example = "10") private BigDecimal amount; @ApiModelProperty(value = "充值单号", example = "10") private String rechargeNo; @ApiModelProperty(hidden = true) private Long memberId; src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -16,6 +16,7 @@ import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.ICommonService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; import cc.mrbird.febs.mall.vo.*; import cc.mrbird.febs.pay.model.BrandWCPayRequestData; import cc.mrbird.febs.pay.service.IXcxPayService; @@ -67,6 +68,7 @@ private final MallTeamLeaderMapper mallTeamLeaderMapper; private final SpringContextHolder springContextHolder; private final MallAgentRecordMapper mallAgentRecordMapper; private final IMallMoneyFlowService mallMoneyFlowService; @Value("${spring.profiles.active}") @@ -752,7 +754,8 @@ return new FebsResponse().fail().message("成为合伙人的金额为"+agentPrice); } } String rechargeNo = "CZ_"+MallUtils.getOrderNum(); apiRechargeWalletDto.setRechargeNo(rechargeNo); apiRechargeWalletDto.setMemberId(memberId); BrandWCPayRequestData brandWCPayRequestData = null; try { @@ -760,6 +763,14 @@ } catch (Exception e) { throw new FebsException("支付失败"); } mallMoneyFlowService.addMoneyFlow( memberId, amount, MoneyFlowTypeEnum.RECHARGE.getValue(), rechargeNo, FlowTypeEnum.BALANCE.getValue(), "余额充值",1); String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData); String payResultStr = brandWCPayRequestData.getPrepay_id(); Map<String, Object> map = new HashMap<>(); src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -78,7 +78,7 @@ BrandWCPayRequestData payData; String productNames = "小程序充值"; MallMember mallMember = mallMemberMapper.selectById(apiRechargeWalletDto.getMemberId()); String rechargeNo = "CZ_"+MallUtils.getOrderNum(); String rechargeNo = apiRechargeWalletDto.getRechargeNo(); Boolean debug = xcxProperties.getDebug(); String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+",'type':"+apiRechargeWalletDto.getType()+"}"; if (debug) { @@ -88,13 +88,6 @@ payData = weixinServiceUtil.createRechargeWallet(productNames, rechargeNo, unit.multiply(money).intValue(),mallMember.getOpenId(), attrStr); } mallMoneyFlowService.addMoneyFlow( mallMember.getId(), money, MoneyFlowTypeEnum.RECHARGE.getValue(), rechargeNo, FlowTypeEnum.BALANCE.getValue(), "余额充值",1); return payData; }