From 664349439d5b1faeaba563a0973af1ba0f3a9c84 Mon Sep 17 00:00:00 2001
From: wyq <wangyuqi234@163.com>
Date: Tue, 29 Apr 2025 09:15:44 +0800
Subject: [PATCH] 1

---
 .../java/com/zbkj/admin/config/SmsConfig.java | 40 +++++++++++++++++++
 .../src/main/resources/application-prod.yml   |  6 ++-
 .../src/main/resources/application.yml        |  5 +++
 .../service/impl/OrderPayServiceImpl.java     |  6 +++
 .../service/service/impl/SmsServiceImpl.java  |  2 +-
 5 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 crmeb-admin/src/main/java/com/zbkj/admin/config/SmsConfig.java

diff --git a/crmeb-admin/src/main/java/com/zbkj/admin/config/SmsConfig.java b/crmeb-admin/src/main/java/com/zbkj/admin/config/SmsConfig.java
new file mode 100644
index 0000000..07ae1df
--- /dev/null
+++ b/crmeb-admin/src/main/java/com/zbkj/admin/config/SmsConfig.java
@@ -0,0 +1,40 @@
+package com.zbkj.admin.config;
+
+
+import com.aliyun.dysmsapi20170525.Client;
+import com.aliyun.teaopenapi.models.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author admin2
+ */
+
+@Configuration
+public class SmsConfig {
+
+    @Value("${sms.appkey}")
+    private String accessKeyId ;
+    @Value("${sms.secret}")
+    private String accessKeySecret  ;
+
+    private static final String ENDPOINT = "dysmsapi.aliyuncs.com";
+
+    @Bean
+    public Client smsClient() {
+        try {
+            Config config = new Config()
+                    // 必填，您的 AccessKey ID
+                    .setAccessKeyId(accessKeyId)
+                    // 必填，您的 AccessKey Secret
+                    .setAccessKeySecret(accessKeySecret);
+            // 访问的域名
+            config.endpoint = ENDPOINT;
+            return new Client(config);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/crmeb-admin/src/main/resources/application-prod.yml b/crmeb-admin/src/main/resources/application-prod.yml
index 9336861..ecb9ac0 100644
--- a/crmeb-admin/src/main/resources/application-prod.yml
+++ b/crmeb-admin/src/main/resources/application-prod.yml
@@ -169,4 +169,8 @@ mdb:
   userClientId: fd9z85kk-8665-64d4-9986-228a2h59b113
   userUrl: https://creditcardapp.bankcomm.com/oautht
   goodUrl: https://shopmall.xsbuy.cn/pages/goods/goods_details/index?id=
-
+sms:
+  appkey: LTAI5tJdJ474w6EzLS6dBaRd
+  secret: fd2qfdKUn0NJbe6lVEWA66sxVSWhqN
+  template-code: SMS_174435568
+  sign-name: 上海湘商
diff --git a/crmeb-admin/src/main/resources/application.yml b/crmeb-admin/src/main/resources/application.yml
index dcc1500..fae93bd 100644
--- a/crmeb-admin/src/main/resources/application.yml
+++ b/crmeb-admin/src/main/resources/application.yml
@@ -190,3 +190,8 @@ mdb:
   userClientId: fd9z85kk-8665-64d4-9986-228a2h59b113
   userUrl: http://piap_oauth_web.ydhl-dev1.apps.paasdev.pccc.com
   goodUrl: http://mallshop-test.xsbuy.cn:200/static/html/pc.html
+sms:
+  appkey: LTAI5tJdJ474w6EzLS6dBaRd
+  secret: fd2qfdKUn0NJbe6lVEWA66sxVSWhqN
+  template-code: SMS_174435568
+  sign-name: 上海湘商
\ No newline at end of file
diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java
index 65eb7c3..90f7fa1 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java
@@ -739,6 +739,12 @@ public class OrderPayServiceImpl implements OrderPayService {
         if (storeOrder.getPaid()) {
             throw new CrmebException("订单已支付");
         }
+        //支付前查看先订单之前是否有支付会自动更新订单表
+        weChatPayService.queryPayResult(storeOrder.getOrderId());
+        storeOrder = storeOrderService.getByOderId(orderPayRequest.getOrderNo());
+        if (storeOrder.getPaid()) {
+            throw new CrmebException("订单已支付");
+        }
         User user = userService.getById(storeOrder.getUid());
         if (ObjectUtil.isNull(user)) throw new CrmebException("用户不存在");
 
diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java
index 27c2dab..7ed9e6e 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java
@@ -63,7 +63,7 @@ public class SmsServiceImpl implements SmsService {
 
     @Autowired
     private SystemConfigService systemConfigService;
-    @Autowired
+    @Resource
     private com.aliyun.dysmsapi20170525.Client smsClient;
     @Autowired
     private RestTemplateUtil restTemplateUtil;