diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index e3c0c74..43bbff8 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/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; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml index 7b4a182..b49c42d 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml @@ -4,7 +4,7 @@ - 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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ada4ffe..5be3164 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: # 多环境配置 spring: profiles: - active: dev + active: glt2 application: name: server