Jelajahi Sumber

改动过的

huanglizhi 1 tahun lalu
induk
melakukan
098fdcc707

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -284,7 +284,6 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void orderSend(Long sendOrderId, PreOrderModelDTO orderSendDO) {
-        redisTemplate.delete(sendOrderId);
         OrderSendDO aDo = orderSendManager.getById(sendOrderId);
         OrderDO orderDO = getById(aDo.getOrderId());
         converter.copyProperties(aDo, orderSendDO, orderSendDO.getReceiver(), orderSendDO.getSender());
@@ -424,6 +423,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         //更改订单状态
         orderDO.setStatus(SaleOrderStatusEnum.SENDING);
         updateById(orderDO);
+        redisTemplate.delete(sendOrderId);
     }
 
     @Override

+ 18 - 0
server/src/main/resources/application-local.yml

@@ -60,3 +60,21 @@ kuaidianiao:
     key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
     apiUrl: https://api.kdniao.com/api/dist
 
+alipay:
+  #APPID
+  appId: 2021004150628230
+  #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->应用私钥
+  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=
+  #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->支付宝公钥
+  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwjbDKtCtW9OHHGfOfbDV0Jn5cVSjTZglJpbRqmVLnWs1U51QQuOoB1ilriqWJDpmd0YApslxw13eGCAgdIuSwo2fBJiDdG8fLYzHuopQVNxIENK1WNL8ispnBuo8z+HrwheR2sTfFPXxEqTYyMQdtkbNu1PJ9GJD1EuJRXlvCkieFFlNklulzCCmOtzR2gFRoDaccTqBddbI8E4fpTAK9vDkrinRAbQsoWs6vdfth0qfMZFyvQFQtSRiX8JPfsMVgNsqOErPu0HqFrKPvhf3ZLJylRkEiY5+AzRO91OxsmhmQcNsdz+fpFCz2hJ5igVhssG0hHWn3o6cH5nqw4E7MwIDAQAB
+  #回调地址
+  notifyUrl: http://529920wmvp80.vicp.fun:52722/admin/erp/pay/aliReturnCall
+  #网关地址
+  serverUrl: https://openapi.alipay.com/gateway.do
+  #数据格式,推荐:json
+  format: json
+  #编码格式 推荐:utf-8
+  charset: UTF-8
+  #签名方式,签名算法,推荐:RSA2
+  signType: RSA2
+

+ 19 - 1
server/src/main/resources/application-test.yml

@@ -57,4 +57,22 @@ kuaidianiao:
   kuaidi:
     id: 1844388
     key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
-    apiUrl: https://api.kdniao.com/api/dist
+    apiUrl: https://api.kdniao.com/api/dist
+
+alipay:
+  #APPID
+  appId: 2021004150628230
+  #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->应用私钥
+  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=
+  #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->支付宝公钥
+  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwjbDKtCtW9OHHGfOfbDV0Jn5cVSjTZglJpbRqmVLnWs1U51QQuOoB1ilriqWJDpmd0YApslxw13eGCAgdIuSwo2fBJiDdG8fLYzHuopQVNxIENK1WNL8ispnBuo8z+HrwheR2sTfFPXxEqTYyMQdtkbNu1PJ9GJD1EuJRXlvCkieFFlNklulzCCmOtzR2gFRoDaccTqBddbI8E4fpTAK9vDkrinRAbQsoWs6vdfth0qfMZFyvQFQtSRiX8JPfsMVgNsqOErPu0HqFrKPvhf3ZLJylRkEiY5+AzRO91OxsmhmQcNsdz+fpFCz2hJ5igVhssG0hHWn3o6cH5nqw4E7MwIDAQAB
+  #回调地址
+  notifyUrl: https://apidoc.raycos.net/admin/erp/pay/aliReturnCall
+  #网关地址
+  serverUrl: https://openapi.alipay.com/gateway.do
+  #数据格式,推荐:json
+  format: json
+  #编码格式 推荐:utf-8
+  charset: UTF-8
+  #签名方式,签名算法,推荐:RSA2
+  signType: RSA2

+ 0 - 20
server/src/main/resources/application.yml

@@ -50,26 +50,6 @@ shop-tnt:
   http-address: https://q26970737o.yicp.fun
   sign-secret: AT5W8XCsvGnxMY1RVguB
 
-
-alipay:
-  #APPID
-  appId: 2021004150628230
-  #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->应用私钥
-  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=
-  #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->支付宝公钥
-  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwjbDKtCtW9OHHGfOfbDV0Jn5cVSjTZglJpbRqmVLnWs1U51QQuOoB1ilriqWJDpmd0YApslxw13eGCAgdIuSwo2fBJiDdG8fLYzHuopQVNxIENK1WNL8ispnBuo8z+HrwheR2sTfFPXxEqTYyMQdtkbNu1PJ9GJD1EuJRXlvCkieFFlNklulzCCmOtzR2gFRoDaccTqBddbI8E4fpTAK9vDkrinRAbQsoWs6vdfth0qfMZFyvQFQtSRiX8JPfsMVgNsqOErPu0HqFrKPvhf3ZLJylRkEiY5+AzRO91OxsmhmQcNsdz+fpFCz2hJ5igVhssG0hHWn3o6cH5nqw4E7MwIDAQAB
-  #回调地址
-  notifyUrl: http://529920wmvp80.vicp.fun:52722/admin/erp/pay/aliReturnCall
-  #网关地址
-  serverUrl: https://openapi.alipay.com/gateway.do
-  #数据格式,推荐:json
-  format: json
-  #编码格式 推荐:utf-8
-  charset: UTF-8
-  #签名方式,签名算法,推荐:RSA2
-  signType: RSA2
-
-
 wx:
   #商户APIV3密钥
   merchantId: 1639044836