feat(order): 添加订单状态字段并更新关联查询

- 在 ShopDealerOrder 实体中新增 orderStatus 字段用于显示订单状态
- 更新 ShopDealerOrderMapper.xml 中的关联查询，加入订单状态字段映射
- 修改 application.yml 配置文件，将默认激活环境从 dev 改为 glt2
- 通过 LEFT JOIN 关联 shop_order 表获取订单状态数据

src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java

@@ -39,6 +39,10 @@ public class ShopDealerOrder implements Serializable {
     @Excel(name = "订单编号")
     private String orderNo;
 
+    @Excel(name = "订单状态")
+    @TableField(exist = false)
+    private Integer orderStatus;
+
     @Schema(description = "买家用户昵称")
     @TableField(exist = false)
     private String nickname;

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*, b.nickname, c.nickname AS firstNickname, d.nickname AS secondNickname, e.nickname AS thirdNickname, f.rate, f.price, g.nickname AS firstDividendUserName, h.nickname AS secondDividendUserName
+        SELECT a.*, b.nickname, c.nickname AS firstNickname, d.nickname AS secondNickname, e.nickname AS thirdNickname, f.rate, f.price, g.nickname AS firstDividendUserName, h.nickname AS secondDividendUserName, o.order_status AS orderStatus
         FROM shop_dealer_order a
         LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
         LEFT JOIN gxwebsoft_core.sys_user c ON a.first_user_id = c.user_id
@@ -12,6 +12,7 @@
         LEFT JOIN gxwebsoft_core.sys_user e ON a.third_user_id = e.user_id
         LEFT JOIN gxwebsoft_core.sys_user g ON a.first_dividend_user = g.user_id
         LEFT JOIN gxwebsoft_core.sys_user h ON a.second_dividend_user = h.user_id
+        LEFT JOIN shop_order o ON a.order_no = o.order_no
         LEFT JOIN shop_dealer_user f ON a.user_id = f.user_id
         <where>
             <if test="param.id != null">

src/main/resources/application.yml

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