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

feat(BdWaresOrder-Sale): 商品订单及导出移除系统类型字段

This commit is contained in:
woody 2025-05-21 14:53:20 +08:00 committed by cabbage
parent 8170453a4b
commit 138f67580f
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,9 +170,4 @@ public class WaresOrderParam extends BaseAuthorityEntity {
*/ */
private String commodityName; private String commodityName;
/**
* 系统类型（0=会员系统，1=海圣优选）
*/
private Integer systemType;
} }

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

@ -290,12 +290,6 @@ public class WaresOrderVo implements Serializable {
// @Excel(name = "开票备注") // @Excel(name = "开票备注")
private String remarks; private String remarks;
/**
* 系统类型（0=会员系统，1=海圣优选）
*/
@Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选")
private Integer systemType;
/** /**
* 创建时间 * 创建时间
*/ */

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

@ -848,15 +848,11 @@
so.box_num, so.box_num,
m.MEMBER_CODE buyMemberCode, m.MEMBER_CODE buyMemberCode,
m.MEMBER_NAME buyMemberName, m.MEMBER_NAME buyMemberName,
so.ORDER_ASS_ACHIEVE orderAssAchieve, so.ORDER_ASS_ACHIEVE orderAssAchieve
so.SYSTEM_TYPE
from sa_order so from sa_order so
left join CU_MEMBER cm on cm.PK_ID = so.PK_MEMBER 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 CU_MEMBER m on m.PK_ID = so.PK_CREATOR
where so.DEL_FLAG = 0 where so.DEL_FLAG = 0
<if test="systemType != null">
and so.SYSTEM_TYPE = #{systemType}
</if>
<if test="pkCountry != null"> <if test="pkCountry != null">
and so.PK_COUNTRY = #{pkCountry} and so.PK_COUNTRY = #{pkCountry}
</if> </if>