From 40809f3fa6ce369e4b07a6dd1ecf05c4c24e0af1 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 9 Jun 2025 14:26:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=BE=AE=E4=BF=A1=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=A0=81=E6=94=AF=E4=BB=98=E7=BA=BF=E4=B8=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/order/HardOrderSumAndCountDto.java | 5 +++++ .../com/bsd/pjcloud/hard/config/WechatPay.java | 4 ++++ .../service/impl/wechat/WechatPayServiceImpl.java | 2 +- .../src/main/resources/application.yml | 15 ++++++++------- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java index e6893a34a..778a1fa9c 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java @@ -10,6 +10,11 @@ public class HardOrderSumAndCountDto { private List userDeptIds; + /** + * 是否包含deptIds + */ + private Boolean isInclude = false; + private List orderStatusCodes; private LocalDateTime[] createTimeList; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/WechatPay.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/WechatPay.java index b201ed6bd..a0e432d75 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/WechatPay.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/WechatPay.java @@ -40,4 +40,8 @@ public class WechatPay { */ private String refundCallbackUrl; + /** + * 调用ip + */ + private String spbillCreateIp; } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/wechat/WechatPayServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/wechat/WechatPayServiceImpl.java index 3ddcd3988..7363ed6c6 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/wechat/WechatPayServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/wechat/WechatPayServiceImpl.java @@ -160,7 +160,7 @@ public class WechatPayServiceImpl implements WechatPayService { // 订单金额(分) params.put("total_fee", dto.getPrice()); // 终端IP - params.put("spbill_create_ip", "220.191.229.131"); + params.put("spbill_create_ip", wechatPay.getSpbillCreateIp()); // 付款码 params.put("auth_code", dto.getWechatQrCode()); // 生成签名 diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml index 58e2aa349..5627eafc8 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml @@ -25,10 +25,11 @@ spring: # pay-callback: # lb-mch-id: 1919673632357584898 -wechat-pay: - merchant-id: 1718803142 - api-v2-key: EDn3OfIZZFwyS9Obx73XgQ8NHt01piUa - app-id: wx4ec0210f4bf42f9f - base-url: https://api.mch.weixin.qq.com - refund-callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-wechant-pay/callback/refund - merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/cert/apiclient_cert.p12 +#wechat-pay: +# merchant-id: 1718803142 +# api-v2-key: EDn3OfIZZFwyS9Obx73XgQ8NHt01piUa +# app-id: wx4ec0210f4bf42f9f +# base-url: https://api.mch.weixin.qq.com +# refund-callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-wechant-pay/callback/refund +# merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/cert/apiclient_cert.p12 +# spbill-create-ip: 59.202.170.152 From 2186f0991a0638bce5531d55bd1fa0ec926c9998 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 9 Jun 2025 15:21:25 +0800 Subject: [PATCH 2/2] 11 --- .../hard/service/impl/order/HardAfterSaleServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java index 73611f8c3..f9ebb11e1 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java @@ -294,10 +294,6 @@ public class HardAfterSaleServiceImpl extends ServiceImpl