From 238fecae7c6f1aafcd91694f7198dfc48c558ffb Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 17 Jul 2024 16:35:14 +0800 Subject: [PATCH] =?UTF-8?q?updates=20=E6=8A=96=E9=9F=B3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=93=E8=82=B2=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yx/controller/YxOrderController.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java index 2e44fd0..49fe84a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java @@ -12,6 +12,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.AssertUtils; import org.jeecg.modules.mini.douyin.config.DouYinConfig; +import org.jeecg.modules.mini.douyin.config.DouYinTiyuConfig; import org.jeecg.modules.mini.douyin.util.DouYinUtil; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxOrder; @@ -46,6 +47,8 @@ public class YxOrderController extends JeecgController private IYxOrderService yxOrderService; @Resource private DouYinConfig douYinConfig; + @Resource + private DouYinTiyuConfig douYinTiyuConfig; /** * 分页列表查询 * @@ -123,7 +126,21 @@ public class YxOrderController extends JeecgController BigDecimal refundAmount = yxOrder.getRefundAmount(); BigDecimal multiply = refundAmount.multiply(YxConstant.bigDecimal100); long refundAmountLong = multiply.longValue(); - String refundOverMessage = DouYinUtil.orderRefund(order.getOrderCode(), douYinConfig.getAppId(), refundAmountLong,yxOrder.getRefundReason(), douYinConfig.getSalt(), douYinConfig.getRefundNotifyUrl()); + + String appId,notifyUrl,salt,refundNotifyUrl; + if ("体育小程序".equals(order.getProgramType())) { + appId = douYinTiyuConfig.getAppId(); + notifyUrl = douYinTiyuConfig.getNotifyUrl(); + salt = douYinTiyuConfig.getSalt(); + refundNotifyUrl = douYinTiyuConfig.getRefundNotifyUrl(); + }else{ + appId = douYinConfig.getAppId(); + notifyUrl = douYinConfig.getNotifyUrl(); + salt = douYinConfig.getSalt(); + refundNotifyUrl = douYinConfig.getRefundNotifyUrl(); + } + + String refundOverMessage = DouYinUtil.orderRefund(order.getOrderCode(), appId, refundAmountLong,yxOrder.getRefundReason(), salt, refundNotifyUrl); if (StringUtils.isNotBlank(refundOverMessage)) { // 退款失败 return Result.error(refundOverMessage);