angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(order): 商品订单及订单详情添加隶属体系字段

This commit is contained in:
woody 2025-06-17 11:14:09 +08:00 committed by cabbage
parent 489ac19cdc
commit 17b9931d1f
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java
View File

@ -170,4 +170,8 @@ public class WaresOrderParam extends BaseAuthorityEntity {
*/
private String commodityName;
/**
* 隶属体系
*/
private Integer vertexId;
}

7
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java
View File

@ -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;
}

9
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
View File

@ -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
<if test="buyMemberCode != null and buyMemberCode != ''">
and m.MEMBER_CODE like #{buyMemberCode}||'%'
</if>
<if test="buyMemberName != null and buyMemberName != ''">
and m.MEMBER_NAME like #{buyMemberName}||'%'
</if>
<if test="vertexId != null">
and cm.PK_VERTEX = #{vertexId}
</if>
<if test="pkCountry != null">
and so.PK_COUNTRY = #{pkCountry}
</if>

8
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -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
<if test="pkCountry != null">
and so.PK_COUNTRY = #{pkCountry}
</if>
<if test="vertexId != null">
and cm.PK_VERTEX = #{vertexId}
</if>
<if test="buyMemberCode != null and buyMemberCode != ''">
and m.MEMBER_CODE like #{buyMemberCode}||'%'
</if>