diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java index feaf0b9f7..002a85ec8 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java @@ -50,7 +50,7 @@ public class WxNativePayClient extends AbstractWxPayClient { WxPayNativeOrderResult response = client.createOrder(request); // 转换结果 - return new PayOrderUnifiedRespDTO(PayOrderDisplayModeEnum.QR_CODE_URL.getMode(), + return new PayOrderUnifiedRespDTO(PayOrderDisplayModeEnum.QR_CODE.getMode(), response.getCodeUrl()); } @@ -68,7 +68,7 @@ public class WxNativePayClient extends AbstractWxPayClient { WxPayNativeOrderResult response = client.createOrderV3(TradeTypeEnum.NATIVE, request); // 转换结果 - return new PayOrderUnifiedRespDTO(PayOrderDisplayModeEnum.QR_CODE_URL.getMode(), + return new PayOrderUnifiedRespDTO(PayOrderDisplayModeEnum.QR_CODE.getMode(), response.getCodeUrl()); } diff --git a/yudao-ui-admin/src/assets/images/pay/icon/wx_native.svg b/yudao-ui-admin/src/assets/images/pay/icon/wx_native.svg new file mode 100644 index 000000000..bf3ba2b61 --- /dev/null +++ b/yudao-ui-admin/src/assets/images/pay/icon/wx_native.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yudao-ui-admin/src/utils/constants.js b/yudao-ui-admin/src/utils/constants.js index 801ca76cc..781b0a0a9 100644 --- a/yudao-ui-admin/src/utils/constants.js +++ b/yudao-ui-admin/src/utils/constants.js @@ -132,6 +132,10 @@ export const PayChannelEnum = { "code": "wx_app", "name": "微信 APP 支付" }, + WX_NATIVE: { + "code": "wx_native", + "name": "微信扫码支付" + }, WX_BAR: { "code": "wx_bar", "name": "微信条码支付" diff --git a/yudao-ui-admin/src/views/pay/cashier/index.vue b/yudao-ui-admin/src/views/pay/cashier/index.vue index 41d8ce159..90e5d647e 100644 --- a/yudao-ui-admin/src/views/pay/cashier/index.vue +++ b/yudao-ui-admin/src/views/pay/cashier/index.vue @@ -125,6 +125,10 @@ export default { name: '微信 App 支付', icon: require("@/assets/images/pay/icon/wx_app.svg"), code: "wx_app" + }, { + name: '微信扫码支付', + icon: require("@/assets/images/pay/icon/wx_native.svg"), + code: "wx_native" }, { name: '微信条码支付', icon: require("@/assets/images/pay/icon/wx_bar.svg"),