diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java index 6715d64..80b2a06 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java @@ -199,6 +199,12 @@ public class OrderApplicationService { if (Objects.equals(command.getPaymentType(), "wechat")) { // 新增支付接口调用 WxJsApiPreCreateRequest paymentRequest = buildPaymentRequest(orderModel); + // 设置是否为微信小程序支付 + if (command.getIsWxMp() == null) { + command.setIsWxMp(0); + } + paymentRequest.setIs_wx_mp(command.getIsWxMp() == 1 ? "true" : "false"); + WxJsApiPreCreateResponse paymentResponse = paymentApplicationService.callJsApiPreCreate(paymentRequest); // 记录支付操作日志 AddPaymentOperationLogCommand paymentOperationLogCommand = new AddPaymentOperationLogCommand(); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/command/SubmitOrderCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/command/SubmitOrderCommand.java index 96ed1ac..b8c4fad 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/command/SubmitOrderCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/command/SubmitOrderCommand.java @@ -42,4 +42,7 @@ public class SubmitOrderCommand { @ApiModelProperty("是否内部订单 0否 1汇邦云用户 2企业微信用户") private Integer isInternal; + + @ApiModelProperty("是否为微信小程序支付,0否 1是") + private Integer isWxMp; } \ No newline at end of file diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/PaymentApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/PaymentApplicationService.java index 0004370..99014d5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/PaymentApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/PaymentApplicationService.java @@ -47,6 +47,9 @@ public class PaymentApplicationService { String result = ""; String jsonBody = ""; try { + if (StringUtils.isBlank(request.getIs_wx_mp()) || (!"true".equals(request.getIs_wx_mp()) && !"false".equals(request.getIs_wx_mp()))) { + request.setIs_wx_mp("false"); + } jsonBody = JSONUtil.toJsonStr(request); log.info("callJsApiPreCreate 请求body:{}", jsonBody); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/dto/WxJsApiPreCreateRequest.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/dto/WxJsApiPreCreateRequest.java index a153356..a72e65b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/dto/WxJsApiPreCreateRequest.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/payment/dto/WxJsApiPreCreateRequest.java @@ -24,4 +24,7 @@ public class WxJsApiPreCreateRequest { private String ucid; // 选填 private String extra; // 选填 + + // 是否为微信小程序支付,"true"或"false" + private String is_wx_mp; } \ No newline at end of file