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 70a2f549..6c0f9c7e 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,9 +170,4 @@ public class WaresOrderParam extends BaseAuthorityEntity { */ private String commodityName; - /** - * 系统类型(0=会员系统,1=海圣优选) - */ - private Integer systemType; - } 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 19cb1069..bdfd9e0d 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 @@ -290,12 +290,6 @@ public class WaresOrderVo implements Serializable { // @Excel(name = "开票备注") private String remarks; - /** - * 系统类型(0=会员系统,1=海圣优选) - */ - @Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选") - private Integer systemType; - /** * 创建时间 */ 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 27397161..150e3623 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,15 +848,11 @@ so.box_num, m.MEMBER_CODE buyMemberCode, m.MEMBER_NAME buyMemberName, - so.ORDER_ASS_ACHIEVE orderAssAchieve, - so.SYSTEM_TYPE + so.ORDER_ASS_ACHIEVE orderAssAchieve 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 where so.DEL_FLAG = 0 - - and so.SYSTEM_TYPE = #{systemType} - and so.PK_COUNTRY = #{pkCountry}