diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java
index 6c0f9c7e..fd5fde46 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java
@@ -170,4 +170,8 @@ public class WaresOrderParam extends BaseAuthorityEntity {
*/
private String commodityName;
+ /**
+ * 隶属体系
+ */
+ private Integer vertexId;
}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java
index bdfd9e0d..6d935413 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java
@@ -100,6 +100,11 @@ public class WaresOrderVo implements Serializable {
@Excel(name = "会员姓名")
private String memberName;
+ /**
+ * 隶属体系
+ */
+ @Excel(name = "隶属体系")
+ private String vertexName;
/**
* 联系电话
*/
@@ -353,6 +358,4 @@ public class WaresOrderVo implements Serializable {
*/
@Excel(name = "订单套数")
private Integer boxNum;
-
-
}
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
index 400e3513..bee2895d 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
@@ -782,7 +782,8 @@
bw.WARES_CODE commodityCode,
bw.WARES_NAME commodityName,
oi.WARES_QUANTITY waresQuantity,
- oi.SKU_CODE skuCode
+ oi.SKU_CODE skuCode,
+ ver.VERTEX_NAME vertexName
from sa_order_items oi
left join sa_order so on oi.PK_ORDER = so.PK_ID
left join BD_CURRENCY bc on bc.PK_ID = so.PK_RATE
@@ -791,13 +792,17 @@
left join BD_WARES bw on bw.PK_ID = we.PK_WARES
left join BD_PRODUCT bp on bp.PK_ID = oi.PK_PRODUCT
left join CU_MEMBER m on m.PK_ID = so.PK_CREATOR
- where oi.del_flag = 0 and so.del_flag=0
+ left join BD_VERTEX ver on ver.PK_ID = cm.PK_VERTEX
+ where oi.del_flag = 0 and so.del_flag=0 and ver.del_flag=0
and m.MEMBER_CODE like #{buyMemberCode}||'%'
and m.MEMBER_NAME like #{buyMemberName}||'%'
+
+ and cm.PK_VERTEX = #{vertexId}
+
and so.PK_COUNTRY = #{pkCountry}
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
index b99bb493..73347d50 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
@@ -848,14 +848,20 @@
so.box_num,
m.MEMBER_CODE buyMemberCode,
m.MEMBER_NAME buyMemberName,
- so.ORDER_ASS_ACHIEVE orderAssAchieve
+ so.ORDER_ASS_ACHIEVE orderAssAchieve,
+ ver.VERTEX_NAME vertexName
from sa_order so
left join CU_MEMBER cm on cm.PK_ID = so.PK_MEMBER
left join CU_MEMBER m on m.PK_ID = so.PK_CREATOR
+ left join BD_VERTEX ver on ver.PK_ID = cm.PK_VERTEX
where so.DEL_FLAG = 0
+ and ver.DEL_FLAG = 0
and so.PK_COUNTRY = #{pkCountry}
+
+ and cm.PK_VERTEX = #{vertexId}
+
and m.MEMBER_CODE like #{buyMemberCode}||'%'