From 3558d6975984aa45b337a52e55726316ea84b513 Mon Sep 17 00:00:00 2001 From: dzq Date: Mon, 24 Mar 2025 09:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=BC=80=E6=9F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../shop/order/OrderApplicationService.java | 15 ++++++++------- .../shop/payment/PaymentApplicationService.java | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/agileboot-admin/src/main/resources/application-dev.yml b/agileboot-admin/src/main/resources/application-dev.yml index 324371f..ea85da0 100644 --- a/agileboot-admin/src/main/resources/application-dev.yml +++ b/agileboot-admin/src/main/resources/application-dev.yml @@ -99,7 +99,7 @@ springdoc: # 项目相关配置 agileboot: # 文件基路径 示例（ Windows配置D:\agileboot，Linux配置 /home/agileboot） - file-base-dir: /var/www/upload + file-base-dir: D:\agileboot # 前端url请求转发前缀 api-prefix: /dev-api demo-enabled: false 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 b9da32a..6bce2af 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 @@ -125,7 +125,7 @@ public class OrderApplicationService { private WxJsApiPreCreateRequest buildPaymentRequest(OrderModel orderModel) { WxJsApiPreCreateRequest request = new WxJsApiPreCreateRequest(); - request.setIp("111.59.237.29"); + request.setIp("222.218.10.217"); request.setOpenid(orderModel.getOpenid()); // request.setBiz_order_id("wxshop-" + orderModel.getOrderId() + "-" + new Date().getTime()); // 使用订单唯一编号 // 金额转换（元转分）并四舍五入 @@ -235,14 +235,15 @@ public class OrderApplicationService { } orderModel.updateById(); - QueryWrapper orderGoodsQueryWrapper = new QueryWrapper<>(); - orderGoodsQueryWrapper.eq("order_id", orderId); - List orderGoods = orderGoodsService.list(orderGoodsQueryWrapper); // 发送指令 - orderGoods.forEach(g -> { - openOrderGoodsCabinet(orderId, g.getOrderGoodsId()); - }); + // 客户端手动开柜 +// QueryWrapper orderGoodsQueryWrapper = new QueryWrapper<>(); +// orderGoodsQueryWrapper.eq("order_id", orderId); +// List orderGoods = orderGoodsService.list(orderGoodsQueryWrapper); +// orderGoods.forEach(g -> { +// openOrderGoodsCabinet(orderId, g.getOrderGoodsId()); +// }); } public static void main(String[] args) { 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 7c559b0..d5f156c 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 @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class PaymentApplicationService { public WxJsApiPreCreateResponse callJsApiPreCreate(WxJsApiPreCreateRequest request) { - String gatewayUrl = "http://111.59.237.29:7890/open/trade/wx/jsapi/precreate"; + String gatewayUrl = "http://222.218.10.217:7890/open/trade/wx/jsapi/precreate"; try { String jsonBody = JSONUtil.toJsonStr(request);