feat(config): 添加新的glt2环境配置并调整订单状态逻辑

- 新增 application-glt2.yml 环境配置文件
- 将默认激活环境从 dev 切换到 glt2
- 更新数据库连接地址和 Redis 配置
- 调整订单退款状态验证逻辑
- 修改订单状态判断条件以支持退款流程优化

src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java

@@ -320,8 +320,7 @@ public class ShopOrderController extends BaseController {
         // 退款相关操作单独走退款接口，便于做财务权限隔离
         if (Objects.equals(shopOrder.getOrderStatus(), 4)
                 || Objects.equals(shopOrder.getOrderStatus(), 5)
-                || Objects.equals(shopOrder.getOrderStatus(), 6)
+                || Objects.equals(shopOrder.getOrderStatus(), 6)) {
-                || Objects.equals(shopOrder.getOrderStatus(), 7)) {
             return fail("退款相关操作请使用退款接口: PUT /api/shop/shop-order/refund");
         }
         ShopOrder shopOrderNow = shopOrderService.getById(shopOrder.getOrderId());
@@ -425,8 +424,8 @@ public class ShopOrderController extends BaseController {
         if (req == null || req.getOrderId() == null || req.getOrderStatus() == null) {
             return fail("orderId 和 orderStatus 不能为空");
         }
-        if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 6)) {
+        if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 6) && !Objects.equals(req.getOrderStatus(), 7)) {
-            return fail("orderStatus 仅支持 4(申请退款) 或 6(同意退款)");
+            return fail("orderStatus 仅支持 4(申请退款) 或 6(同意退款) 或 7(客户端申请退款)");
         }
 
         ShopOrder current = shopOrderService.getById(req.getOrderId());

src/main/resources/application-glt2.yml

@@ -0,0 +1,73 @@
+# 开发环境配置
+
+# 服务器配置
+server:
+  port: 9200
+
+# 数据源配置
+spring:
+  datasource:
+    url: jdbc:mysql://8.134.55.105:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: modules
+    password: tYmmMGh5wpwXR3ae
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+  # redis
+  redis:
+    database: 0
+    host: 8.134.55.105
+    port: 16379
+    password: redis_t74P8C
+
+# 日志配置
+logging:
+  level:
+    com.gxwebsoft: DEBUG
+    com.baomidou.mybatisplus: DEBUG
+
+socketio:
+  host: localhost #IP地址
+
+# MQTT配置
+mqtt:
+  enabled: false  # 添加开关来禁用MQTT服务
+  host: tcp://132.232.214.96:1883
+  username: swdev
+  password: Sw20250523
+  client-id-prefix: hjm_car_
+  topic: /SW_GPS/#
+  qos: 2
+  connection-timeout: 10
+  keep-alive-interval: 20
+  auto-reconnect: true
+
+# 框架配置
+config:
+  # 基础模块接口
+  server-url: https://glt-server.websoft.top/api
+  # 业务模块接口
+  api-url: https://glt-api.websoft.top/api
+  upload-path: /Users/gxwebsoft/Documents/uploads/   # window(D:\Temp)
+
+# 开发环境证书配置
+certificate:
+  load-mode: CLASSPATH  # 开发环境从classpath加载
+  wechat-pay:
+    dev:
+      private-key-file: "apiclient_key.pem"
+      apiclient-cert-file: "apiclient_cert.pem"
+      wechatpay-cert-file: "wechatpay_cert.pem"
+
+# 阿里云翻译配置
+aliyun:
+  translate:
+    access-key-id: LTAI5tEsyhW4GCKbds1qsopg
+    access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO
+    endpoint: mt.cn-hangzhou.aliyuncs.com
+
+# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致）
+wechatpay:
+  transfer:
+    scene-id: 1005
+    scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]'

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 # 多环境配置
 spring:
   profiles:
-    active: dev
+    active: glt2
 
   application:
     name: server