瀏覽代碼

改动过的

huanglizhi 1 年之前
父節點
當前提交
077906447a

+ 15 - 0
module-erp/pom.xml

@@ -11,6 +11,13 @@
 
     <artifactId>module-erp</artifactId>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.hys.app</groupId>
@@ -38,5 +45,13 @@
             <artifactId>weixin-java-pay</artifactId>
             <version>4.6.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.wxpay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version> 0.0.3</version>
+        </dependency>
     </dependencies>
+
+
 </project>

+ 18 - 4
module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java

@@ -2,9 +2,9 @@ package com.hys.app.controller.erp.use;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.internal.util.AlipaySignature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.service.WxPayService;
 import com.hys.app.framework.exception.ServiceException;
 import com.hys.app.model.erp.dos.OrderCustomerFee;
 import com.hys.app.model.erp.dos.OrderDO;
@@ -14,7 +14,6 @@ import com.hys.app.pay.ali.PayOrder;
 import com.hys.app.pay.ali.WxService;
 import com.hys.app.service.erp.OrderCustomerFeeManager;
 import com.hys.app.service.erp.OrderManager;
-import com.wechat.pay.java.core.auth.WechatPay2Validator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -42,6 +40,7 @@ public class PayController {
     private AliPayService aliPayService;
     private WxService wxService;
     private OrderCustomerFeeManager orderCustomerFeeManager;
+    private WxPayService wxPayService;
 
     @ApiOperation(value = "扫描完获取拉起支付的url")
     @PostMapping("/getPayUrl")
@@ -88,4 +87,19 @@ public class PayController {
         }
         return "success";
     }
+
+    @PostMapping("/wxpay/notify")
+    public String payNotify(@RequestBody String xmlData) throws Exception {
+        WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
+
+        if ("SUCCESS".equals(notifyResult.getResultCode())) {
+            // 处理业务逻辑
+            String outTradeNo = notifyResult.getOutTradeNo();
+            String transactionId = notifyResult.getTransactionId();
+            // 更新订单状态等
+            return "<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>";
+        } else {
+            return "<xml><return_code><![CDATA[FAIL]]></return_code></xml>";
+        }
+    }
 }

+ 13 - 0
module-erp/src/main/java/com/hys/app/pay/wx/WxPayConfigMy.java

@@ -1,7 +1,9 @@
 package com.hys.app.pay.wx;
 
+import com.github.binarywang.wxpay.config.WxPayConfig;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
@@ -11,6 +13,17 @@ public class WxPayConfigMy {
     private String appId;
     private String mchId;
     private String mchKey;
+    private String apiV3Key;
     private String keyPath;
 
+    @Bean
+    public WxPayConfig wxPayConfig() {
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(appId); // 服务商AppID
+        payConfig.setMchId(mchId); // 服务商商户号
+        payConfig.setMchKey(mchKey); // 服务商API密钥
+        payConfig.setKeyPath("path/to/your/cert.p12"); // 证书路径
+        payConfig.setApiV3Key(apiV3Key); // 服务商API v3密钥
+        return payConfig;
+    }
 }

+ 9 - 0
module-erp/src/main/java/com/hys/app/pay/wx/WxPayServiceMy.java

@@ -1,11 +1,15 @@
 package com.hys.app.pay.wx;
 
+import com.github.binarywang.wxpay.bean.applyment.WxPayApplymentCreateResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 @Service
 public class WxPayServiceMy {
 
@@ -22,4 +26,9 @@ public class WxPayServiceMy {
         request.setTradeType("JSAPI"); // 或者 "NATIVE", "APP" 等
         return wxPayService.unifiedOrder(request);
     }
+
+//    public WxPayApplymentForSubCreateResult registerSubMerchant(WxPayApplymentForSubCreateRequest request) throws WxPayException {
+//        // 调用wxPayService的方法执行API调用
+//        return wxPayService.createApplymentForSub(request);
+//    }
 }

二進制
server/src/main/resources/apiclient_cert.p12


+ 7 - 7
server/src/main/resources/application-prod.yml

@@ -51,9 +51,9 @@ xxl:
     accessToken:
 
 kuaidianiao:
-  id: 1663339
-  key: 0b15b75c-94b4-482b-a462-fd21e45a50f5
-  apiUrl: http://183.62.170.46:38092/tcpapi/orderdist
+  id: 1844388
+  key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
+  apiUrl: https://api.kdniao.com/tcpapi/orderdist
   kuaidi:
     id: 1844388
     key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
@@ -61,7 +61,7 @@ kuaidianiao:
 
 alipay:
   #APPID
-  appId: 2021004150628230
+  appId: 2021004155640040
   #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->应用私钥
   appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCAg9tPZe2hPnUSIqF+hb9CP+D5pZ+dm1kbFsHrEEP1Vj7rDotaJz1clyjuewvUzXUbBVRUk2zViseze9msoZbz58W9ormvUSivczBx/+rfIAV6CPdNIXa+UpSZLnaumIAoT4CtiTZwnm5QzIhJZdlM7ZVf70ye61/9uWQV74x+d6TsQxQ6iUlyeq6BfSO0LI/7S3iTEUVoJM4szo4bSe44COyExMG2csqdSVwEgmiJVUTocXbOElAsogqHMfl7hj0A/wXBKH9922N1OXTxlhhuEV5oHPUXBmCs+yEfFgh/KkKez584rOoch+6scZLAlqgr5uzl0Wh6yIOsq/9i72EdAgMBAAECggEAVDcTxenjWGCXUvUCouh+Nqmpga649AzSzV+SX7le7yw/OsVjKAbCvSQJHI3haOfiL3zEkE+zaBPzXXhxYiDZzKc6+1PhHjOu15pCStILVX+kVx39ALxHFd0Dp4W9HBivErtWdWGPHSmU3LnLLV3ikfi2hBFKQnG3i4qrPXymslBDN85HWZhdSctUXxNRCbwnee8XOffYt+NNHAwI6pveOW5HnXOaUzjRcoepYXOBBkDIrwx/5W1hgaUv4jIu5v4LG35C2IEy1d+6fHvvjQhK2y29eEpJ889n9Gb1lrvsuqHS/knDiFq66GaTSzIl/qJjMpYLEcNcefpIqB/bmw9dgQKBgQC1yBvpaprNDcE1i5hZANvdjryIkXKwfMi6XO5IXxHLqxNYXQV1KSLABA8PzBtCWYFnlGXiNh+06QxPnCRRrB6YgVQYi4d7rjHVaKegHkPHHR3/hMm8CXQwKpjLutEMu3QVprtZl4wPT/VU6ggnhxUpi36YfD5SwOrzRLVVTmqPkQKBgQC0/E0JT/N/8fvmjnwOir/o2/EVgaegWqakquY3OO4bS1mMygJ394GuLvkDgHEmGtWNSQvQMRnxgFK1L/lGO+OSFQF6WU+jvNupIm6XASBpvErWj3GWLL0lSroda4JNHdaX+tQiCqv57rhfBXbS7dKyLuc3kwlZYxTCSPy7+DLKzQKBgQCGgDC+zYUKkdHSd55axHrp/RHcjpnoofu3gMlCPS2in8sph3JhVPWEU7x9OM02k5le9XtJHDjrl7/nK6Xn1E2zE4YQvzSYu7PdrpjQrXQC4LVweWT2v5v7g5kYrPq+y/hBiON4j9wu/D+O+7ba4GU1HySlWNCYVGvDYaQ2IVZRMQKBgAasu2aZhUB1uzWQkbCzm0pKOkTxyC3YygaOqvjkZ5uoFsBjft3Pyf+TiemAJiwilzejtwTRmsRWWDaIc2gMs2Li1XAetRozz+IX+/4js39Sy2vIVIcWVU93xw9otKCFdjGatZIf1KHeFPykJfK3hKq/ohVhndmnFs/ngzKnf7ANAoGAJ6obEOg3StqXvKATsXNClHYbqSEi73rMSUhvfj5StxfXiMwta99zq5R5nLXWXI6DqCsVstIugqNbDsWQmffzHl+MSUnBWnkZYl5EzBhoz6w0Q/16Gn20dqvLCdkVADnHowzVnT8tWCif6kcD5NG89kwCkdUN7GESc/Y1+9t+OWI=
   #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->支付宝公钥
@@ -78,7 +78,7 @@ alipay:
   signType: RSA2
 
 wxpay:
-  appId: your_app_id
-  mchId: your_merchant_id
-  mchKey: your_merchant_key
+  appId:  wx51e98f2dee35237d
+  mchId: 1638981115
+  mchKey: tt9teerjiwer930i4t54u5894irhjehf
   keyPath: /path/to/your/apiclient_cert.p12