update 支付宝小程序

This commit is contained in:
Guoqs
2024-06-17 15:08:13 +08:00
parent 22d9d15507
commit 8bde6e1eb7
10 changed files with 153 additions and 8 deletions

View File

@@ -102,10 +102,25 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
dto.setGoodsTitle(goodsTitle);
dto.setGoodsDesc(goodsDesc);
dto.setType(ScenarioEnum.ORDER.getValue());
Map<String, Object> weixinMap = onlinePaymentOrder(dto);
Map<String, Object> weixinMap = onlinePaymentOrderForWechat(dto);
// 返回微信支付参数
resultMap.put("weixinMap", weixinMap);
} else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue())) {
// 2023-07-11 全部改为汇付支付
String goodsTitle = "充电费用";
String goodsDesc = "充电桩预付款金额";
if (StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.repay.getValue())) {
goodsTitle = "补缴费用";
goodsDesc = dto.getOrderCode() + "订单补缴金额";
}
dto.setGoodsTitle(goodsTitle);
dto.setGoodsDesc(goodsDesc);
dto.setType(ScenarioEnum.ORDER.getValue());
Map<String, Object> weixinMap = onlinePaymentOrderForWechat(dto);
// 返回微信支付参数
resultMap.put("alipayMap", weixinMap);
} else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue())) { // 白名单支付
// 白名单支付可以直接调支付回调方法
dto.setPayAmount(Constants.WHITELIST_DEFAULT_AMOUNT);
@@ -319,12 +334,18 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
/**
* 在线支付订单
*/
public Map<String, Object> onlinePaymentOrder(PayOrderDTO dto) {
public Map<String, Object> onlinePaymentOrderForWechat(PayOrderDTO dto) {
logger.info("【{}】-在线支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto));
Map<String, Object> weixinMap = adapayService.createPayment(dto);
Map<String, Object> weixinMap = adapayService.createPaymentForWechat(dto);
return weixinMap;
}
public Map<String, Object> onlinePaymentOrderForAlipay(PayOrderDTO dto) {
logger.info("【{}】-在线支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto));
Map<String, Object> alipayMap = adapayService.createPaymentForAlipay(dto);
return alipayMap;
}
/**
* 白名单支付订单
*/

View File

@@ -212,7 +212,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
*/
public Map<String, Object> onlinePaymentOrder(PayOrderDTO dto) {
logger.info("【{}】-在线支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto));
Map<String, Object> weixinMap = adapayService.createPayment(dto);
Map<String, Object> weixinMap = adapayService.createPaymentForWechat(dto);
return weixinMap;
}