充值修改
This commit is contained in:
@@ -440,13 +440,14 @@ public class PayServiceImpl implements PayService {
|
|||||||
throw new CzgException("未开启自定义充值金额");
|
throw new CzgException("未开启自定义充值金额");
|
||||||
}
|
}
|
||||||
Long mainShopId = shopInfoService.getMainIdByShopId(rechargeDTO.getShopId());
|
Long mainShopId = shopInfoService.getMainIdByShopId(rechargeDTO.getShopId());
|
||||||
|
UserInfo userInfo = userInfoService.getById(shopUser.getUserId());
|
||||||
|
|
||||||
BigDecimal amount = shopRechargeService.checkRecharge(mainShopId, rechargeDTO.getShopId(), shopUser.getUserId(), rechargeDTO.getRechargeDetailId(), rechargeDTO.getAmount());
|
BigDecimal amount = shopRechargeService.checkRecharge(mainShopId, rechargeDTO.getShopId(), shopUser.getUserId(), 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()));
|
||||||
return ltPay(rechargeDTO.getShopId(), rechargeDTO.getPayType(), new CzgLtPayReq(payOrderNo, amount.multiply(MONEY_RATE).longValue(),
|
return ltPay(rechargeDTO.getShopId(), rechargeDTO.getPayType(), new CzgLtPayReq(payOrderNo, amount.multiply(MONEY_RATE).longValue(),
|
||||||
rechargeDTO.getPayType(), "会员充值", rechargeDTO.getOpenId(), clientIP, rechargeDTO.getReturnUrl(), rechargeDTO.getBuyerRemark(), ""));
|
rechargeDTO.getPayType(), "会员充值", "wechatPay".equals(rechargeDTO.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId(), clientIP, rechargeDTO.getReturnUrl(), rechargeDTO.getBuyerRemark(), ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user