From 681edcd9447aad5c5f791e7043290308d7cf1922 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 21 May 2025 14:53:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(BdWaresOrder-Sale):=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=8A=E5=AF=BC=E5=87=BA=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hzs/sale/order/param/WaresOrderParam.java | 5 ----- .../src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java | 6 ------ .../src/main/resources/mapper/sale/order/SaOrderMapper.xml | 6 +----- 3 files changed, 1 insertion(+), 16 deletions(-) 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 46b698b9..0bedd4bc 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 @@ -862,15 +862,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}