feat(BdWaresOrder-Sale): 商品订单及导出移除系统类型字段
This commit is contained in:
parent
711e118937
commit
8c193a52da
|
@ -170,9 +170,4 @@ public class WaresOrderParam extends BaseAuthorityEntity {
|
|||
*/
|
||||
private String commodityName;
|
||||
|
||||
/**
|
||||
* 系统类型(0=会员系统,1=海圣优选)
|
||||
*/
|
||||
private Integer systemType;
|
||||
|
||||
}
|
||||
|
|
|
@ -290,12 +290,6 @@ public class WaresOrderVo implements Serializable {
|
|||
// @Excel(name = "开票备注")
|
||||
private String remarks;
|
||||
|
||||
/**
|
||||
* 系统类型(0=会员系统,1=海圣优选)
|
||||
*/
|
||||
@Excel(name = "系统类型", readConverterExp = "0=会员系统,1=海圣优选")
|
||||
private Integer systemType;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
|
|
|
@ -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
|
||||
<if test="systemType != null">
|
||||
and so.SYSTEM_TYPE = #{systemType}
|
||||
</if>
|
||||
<if test="pkCountry != null">
|
||||
and so.PK_COUNTRY = #{pkCountry}
|
||||
</if>
|
||||
|
|
Loading…
Reference in New Issue