From 458cd44072f106a528aaa78bb0dbbd9999ad37a0 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 25 Jun 2025 13:56:04 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E5=AE=9E=E4=BD=93=E5=8F=8A?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/dto/MemberFirstOrderDTO.java   |  16 +-
 .../hzs/sale/order/dto/MyOrderItemsDTO.java   |   6 +-
 .../com/hzs/sale/order/dto/OrderGoalsDTO.java |  46 -----
 .../hzs/sale/order/dto/SaOrderRangeDto.java   |   7 -
 .../hzs/sale/order/dto/SingleItemStatDTO.java |  16 +-
 .../order/dto/SingleItemStatParamDTO.java     |  16 +-
 .../sale/order/dto/WaresItemsParamDTO.java    |   6 +-
 .../com/hzs/sale/order/dto/WaresOrderDTO.java |   7 -
 .../bonus/bonus/CuMemberBonusExpandMapper.xml |   6 +-
 .../bonus/bonus/CuMemberBonusPushMapper.xml   |   6 +-
 .../bonus/bonus/CuMemberBonusRangeMapper.xml  |   5 +-
 .../detail/CuMemberAssessDetailMapper.xml     | 128 ++++++------
 .../bonus/detail/CuMemberAssessMapper.xml     |   6 -
 .../mapper/member/base/CuMemberMapper.xml     |   2 -
 .../member/base/CuMemberShareMapper.xml       |   2 -
 .../detail/CuMemberAssessDetailMapper.xml     |  10 -
 .../order/param/BlankRegistrationParam.java   |  56 ------
 .../order/param/CuMemberAccountParam.java     |   7 -
 .../order/param/FansConfirmOrderParam.java    |  72 -------
 .../order/param/FansConfirmOrderSkuParam.java |  25 ---
 .../param/FansConfirmOrderWaresParam.java     |  32 ---
 .../hzs/sale/order/param/OrderGoalsParam.java |  44 -----
 .../hzs/sale/order/param/SelfPickUpParam.java |   7 +-
 .../hzs/sale/order/vo/SaTOrderQueryVO.java    | 184 ------------------
 24 files changed, 82 insertions(+), 630 deletions(-)
 delete mode 100644 bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java
 delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/BlankRegistrationParam.java
 delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderParam.java
 delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderSkuParam.java
 delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderWaresParam.java
 delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderGoalsParam.java
 delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/SaTOrderQueryVO.java

diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java
index af7a1cda..15eb37dc 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java
@@ -1,10 +1,4 @@
-package com.hzs.sale.order.dto;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/11/25 16:41
- * @Classname: MemberFirstOrderDTO
- * @PackageName: com.hzs.sale.order.dto
- */
+package com.hzs.sale.order.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,14 +7,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.dto
- *@Author: yh
- *@CreateTime: 2023-11-25  16:41
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java
index 2e8ee7ab..5e9b261d 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java
@@ -5,11 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * @Description: 我的订单明细返回VO
- * @Author: zhangjing
- * @Time: 2023/11/16 16:13
- * @Classname: MyOrderItemsDTO
- * @PackageName: com.hzs.sale.order.vo
+ * 我的订单明细返回VO
  */
 @Data
 public class MyOrderItemsDTO {
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java
deleted file mode 100644
index 3a88dbbf..00000000
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.hzs.sale.order.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 订单目标参数
- * @Description:
- * @Author: ljc
- * @Time: 2023/5/18 17:35
- * @Classname: OrderGoalsDTO
- * @Package_name: com.hzs.sale.order.dto
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderGoalsDTO  implements Serializable {
-
-    private static final long serialVersionUID = 7855859842385975078L;
-    /**
-     * 会员ID
-     */
-    private Long pkMember;
-    /**
-     * 国家ID
-     */
-    private Integer pkCountry;
-    /**
-     * 开始时间
-     */
-    private String startDate;
-    /**
-     * 结束时间
-     */
-    private String endDate;
-
-    /**
-     * 安置部门
-     */
-    private Integer placeDept;
-}
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java
index 314c43d9..8a2bea99 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java
@@ -5,13 +5,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2022/12/30 17:14
- * @Classname: SaOrderRangeDto
- * @PackageName: com.hzs.sale.order.dto
- */
 @Data
 public class SaOrderRangeDto implements Serializable {
 
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java
index fc6645ca..25b7cdbe 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java
@@ -1,10 +1,4 @@
-package com.hzs.sale.order.dto;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2024/5/14 10:48
- * @Classname: SingleItemStatDTO
- * @PackageName: com.hzs.sale.order.dto
- */
+package com.hzs.sale.order.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzs.common.core.annotation.Excel;
@@ -13,14 +7,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.dto
- *@Author: yh
- *@CreateTime: 2024-05-14  10:48
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 public class SingleItemStatDTO implements Serializable {
 
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java
index d0688d71..fe018920 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java
@@ -1,24 +1,10 @@
-package com.hzs.sale.order.dto;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2024/5/14 14:16
- * @Classname: SingleItemStatParamDTO
- * @PackageName: com.hzs.sale.order.dto
- */
+package com.hzs.sale.order.dto;
 
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.dto
- *@Author: yh
- *@CreateTime: 2024-05-14  14:16
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 public class SingleItemStatParamDTO implements Serializable {
 
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java
index ec555388..b4a59e9e 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java
@@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
 /**
- * @Description: 商品明细参数
- * @Author: zhangjing
- * @Time: 2022/9/15 17:00
- * @Classname: WaresItemsParam
- * @PackageName: com.hzs.sale.order.param
+ * 商品明细参数
  */
 @Data
 @Builder
diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java
index 1a4d4826..c89bce0b 100644
--- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java
+++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java
@@ -9,13 +9,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-/**
- * @Description:
- * @Author: zhangjong
- * @Time: 2023/11/16 14:09
- * @Classname: WaresOrderDTO
- * @PackageName: com.hzs.sale.order.vo
- */
 @Data
 public class WaresOrderDTO implements Serializable {
 
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml
index f080019f..2279de06 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml
@@ -167,16 +167,16 @@
         </where>
         order by b.period,b.pk_bonus_items,b.real_income desc
     </select>
+
     <select id="queryMemberBonusExpandByBonusItemsForServer" resultMap="CuMemberBonusExpand">
         select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
         b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,b.current_touch,b.expand_touch,
-        b.expand_no_capping,b.expand_capping,b.expand_normal_half,b.expand_normal_real,bct.short_name settle_country from (
+        b.expand_no_capping,b.expand_capping,b.expand_normal_half,b.expand_normal_real,bct.short_name settle_country
+        from (
         select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
         ) so
         inner join (
         select cb.pk_member,ce.pk_order,cb.period,cb.pk_country,ce.pk_bonus_items,ce.income_status,ce.CAL_ACHIEVE,ce.pretax_income,ce.income_tax,ce.real_income,
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushMapper.xml
index 9f9e6f41..92caff3f 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushMapper.xml
@@ -158,15 +158,15 @@
         </where>
         order by b.period,b.pk_bonus_items,b.real_income desc
     </select>
+
     <select id="queryMemberBonusPushByBonusItemsFoServer" resultMap="CuMemberBonusPush">
         select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
-        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,(b.round+1) round,b.second,bct.short_name settle_country from (
+        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,(b.round+1) round,b.second,bct.short_name settle_country
+        from (
         select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
         ) so
         inner join (
         select cb.pk_member,cp.pk_order,cb.period,cb.pk_country,cp.pk_bonus_items,cp.income_status,cp.CAL_ACHIEVE,cp.pretax_income,cp.income_tax,cp.real_income,
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml
index 7ba51c1e..e43aca15 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml
@@ -154,10 +154,9 @@
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
-        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country from (
+        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
+        from (
         select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
         ) so
         inner join (
         select
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessDetailMapper.xml
index 42fae315..6bf61715 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessDetailMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessDetailMapper.xml
@@ -4,29 +4,20 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.hzs.common.domain.member.detail.CuMemberAssessDetail">
-        <id column="PK_ID" property="pkId" />
-        <result column="DEL_FLAG" property="delFlag" />
-        <result column="PK_COUNTRY" property="pkCountry" />
-        <result column="CREATION_TIME" property="creationTime" />
-        <result column="MODIFIED_TIME" property="modifiedTime" />
-        <result column="PK_ASSESS" property="pkAssess" />
-        <result column="PK_MEMBER" property="pkMember" />
-        <result column="PK_ORDER" property="pkOrder" />
-        <result column="CHANGE_TYPE" property="changeType" />
-        <result column="TRADE_TIME" property="tradeTime" />
-        <result column="PK_CREATOR" property="pkCreator" />
-        <result column="PK_MODIFIED" property="pkModified" />
+        <id column="PK_ID" property="pkId"/>
+        <result column="DEL_FLAG" property="delFlag"/>
+        <result column="PK_COUNTRY" property="pkCountry"/>
+        <result column="CREATION_TIME" property="creationTime"/>
+        <result column="MODIFIED_TIME" property="modifiedTime"/>
+        <result column="PK_ASSESS" property="pkAssess"/>
+        <result column="PK_MEMBER" property="pkMember"/>
+        <result column="PK_ORDER" property="pkOrder"/>
+        <result column="CHANGE_TYPE" property="changeType"/>
+        <result column="TRADE_TIME" property="tradeTime"/>
+        <result column="PK_CREATOR" property="pkCreator"/>
+        <result column="PK_MODIFIED" property="pkModified"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_ID, PK_ASSESS, PK_MEMBER, PK_ORDER, CHANGE_TYPE, TRADE_TIME, CREATOR, MODIFIED
-    </sql>
-
     <insert id="insertCuMemberAssessDetailByPeriod">
         merge into cu_member_assess_detail a
         using (select ca.pk_id,ca.pk_member,(case when ca.assess_type=0 then 1 else 3 end) change_type,
@@ -40,53 +31,65 @@
         on (a.pk_assess = b.pk_id and a.pk_member = b.pk_member and a.change_type=b.change_type)
         when not matched then
         insert (pk_assess,pk_member,change_type,trade_achieve, pk_creator,pk_country)
-            values(b.pk_id,b.pk_member,b.change_type,b.trade_achieve, b.pk_creator,b.pk_country)
+        values(b.pk_id,b.pk_member,b.change_type,b.trade_achieve, b.pk_creator,b.pk_country)
     </insert>
 
     <insert id="insertCuMemberAssesDetailByOrder">
-        insert into cu_member_assess_detail (pk_assess,pk_member,PK_ORDER,change_type,trade_achieve,TRADE_TIME, pk_creator,pk_country)
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
-        0 CHANGE_TYPE,order_achieve TRADE_ACHIEVE,
-        pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_order so
-        left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=0) ca
-        on so.pk_member = ca.pk_member
-        where so.del_flag=0 and so.order_status=1 and order_type in(3,12,14,22,26,31)
-        and so.order_achieve >0
-        and pay_time >=#{startDate, jdbcType=DATE}
-        and pay_time &lt; #{endDate, jdbcType=DATE}
-        union
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
-               0 CHANGE_TYPE,order_achieve TRADE_ACHIEVE,
-               pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_t_order so
-       left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=0) ca
-                    on so.pk_member = ca.pk_member
-        where so.del_flag=0 and so.order_status=1 and order_type in (21)
-          and so.order_achieve >0
-          and pay_time >=#{startDate, jdbcType=DATE}
+        insert into cu_member_assess_detail (pk_assess, pk_member, PK_ORDER, change_type, trade_achieve, TRADE_TIME, pk_creator, pk_country)
+        select nvl(ca.pk_id, 0) PK_ASSESS,
+               so.PK_MEMBER,
+               so.pk_id         pk_order,
+               0                CHANGE_TYPE,
+               order_achieve    TRADE_ACHIEVE,
+               pay_time         TRADE_TIME,
+               so.PK_MEMBER,
+               so.pk_country
+        from sa_order so
+                 left join (select * from ${tableName} where period = #{period} and ASSESS_TYPE = 0) ca
+                           on so.pk_member = ca.pk_member
+        where so.del_flag = 0
+          and so.order_status = 1
+          and order_type in (3, 12, 14, 22, 26, 31)
+          and so.order_achieve > 0
+          and pay_time >= #{startDate, jdbcType=DATE}
           and pay_time &lt; #{endDate, jdbcType=DATE}
         union
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
-               2 CHANGE_TYPE,order_ass_achieve TRADE_ACHIEVE,
-               pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_order so
-        left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=1) ca
-                   on so.pk_member = ca.pk_member
-        where so.del_flag=0 and so.order_status=1 and order_type =13
-          and pay_time >=#{startDate, jdbcType=DATE}
+        select nvl(ca.pk_id, 0)  PK_ASSESS,
+               so.PK_MEMBER,
+               so.pk_id          pk_order,
+               2                 CHANGE_TYPE,
+               order_ass_achieve TRADE_ACHIEVE,
+               pay_time          TRADE_TIME,
+               so.PK_MEMBER,
+               so.pk_country
+        from sa_order so
+                 left join (select * from ${tableName} where period = #{period} and ASSESS_TYPE = 1) ca
+                           on so.pk_member = ca.pk_member
+        where so.del_flag = 0
+          and so.order_status = 1
+          and order_type = 13
+          and pay_time >= #{startDate, jdbcType=DATE}
           and pay_time &lt; #{endDate, jdbcType=DATE}
     </insert>
 
     <update id="updateCuMemberAssessDetailByPeriod">
         merge into cu_member_assess_detail a
-        using (select pk_id,pk_member,(case when assess_type=0 then 1 else 3 end)change_type,
-        assess_target trade_achieve,pk_creator,pk_country from ${tableName}
-        where assess_status=2 and period = #{period}
-        and assess_target &lt;= month_balance+month_add) b
-        on (a.pk_assess = b.pk_id and a.pk_member = b.pk_member and a.change_type=b.change_type)
-        when matched then
-        update set a.trade_achieve = b.trade_achieve
-        when not matched then
-        insert (pk_assess,pk_member,change_type,trade_achieve, pk_creator,pk_country)
-            values(b.pk_id,b.pk_member,b.change_type,b.trade_achieve, b.pk_creator,b.pk_country)
+            using (select pk_id,
+                          pk_member,
+                          (case when assess_type = 0 then 1 else 3 end) change_type,
+                          assess_target                                 trade_achieve,
+                          pk_creator,
+                          pk_country
+                   from ${tableName}
+                   where assess_status = 2
+                     and period = #{period}
+                     and assess_target &lt;= month_balance + month_add) b
+            on (a.pk_assess = b.pk_id and a.pk_member = b.pk_member and a.change_type = b.change_type)
+            when matched then
+                update set a.trade_achieve = b.trade_achieve
+            when not matched then
+                insert (pk_assess, pk_member, change_type, trade_achieve, pk_creator, pk_country)
+                    values (b.pk_id, b.pk_member, b.change_type, b.trade_achieve, b.pk_creator, b.pk_country)
     </update>
 
     <update id="updateCuMemberAssessDetailByRevoke">
@@ -99,9 +102,14 @@
         when matched then
         update set a.del_flag=1
     </update>
+
     <delete id="deleteCuMemberAssessDetailByPeriod">
-        DELETE  FROM  cu_member_assess_detail  WHERE  pk_assess  IN  (
-        SELECT  pk_id  FROM  ${tableName}  WHERE  period= #{period})
+        DELETE
+        FROM cu_member_assess_detail
+        WHERE pk_assess IN (
+            SELECT pk_id
+            FROM ${tableName}
+            WHERE period = #{period})
     </delete>
 
 </mapper>
diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml
index 5769d78d..3b55fed8 100644
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml
@@ -155,12 +155,6 @@
             #{item}
         </foreach>
         and pay_time >= #{startDate, jdbcType=DATE} and pay_time &lt; #{endDate, jdbcType=DATE}
-       <!-- <if test="assessType == 0">
-            union all
-            select pk_member,order_achieve order_achieve from sa_t_order
-            where del_flag = 0 and order_status = 1 and order_type =21
-            and pay_time >= #{startDate, jdbcType=DATE} and pay_time &lt; #{endDate, jdbcType=DATE}
-        </if>-->
         )
         group by pk_member
         ) b
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
index ae36b406..5d395ccf 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
@@ -1623,8 +1623,6 @@
         where 1 = 1 and cm.DEL_FLAG = 0 and cm.pay_status=1 and cm.PK_SETTLE_GRADE = 1
         and (
         (select count(so.PK_ID) from sa_order so where so.PK_MEMBER = cm.pk_id and so.DEL_FLAG = 0 and so.ORDER_STATUS = 1) > 0
-        or
-        (select count(sto.PK_ID) from sa_t_order sto where sto.PK_MEMBER = cm.pk_id and sto.DEL_FLAG = 0 and sto.ORDER_STATUS = 1) > 0
         )
         <if test="memberInfo != null and memberInfo != ''">
             and (cm.member_code=#{memberInfo} or cm.member_name=#{memberInfo})
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml
index 67392c92..f6abf3b8 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml
@@ -14,8 +14,6 @@
         and
         (
         (select count(so.PK_ID) from sa_order so where so.PK_CREATOR = ms.pk_id and so.del_flag = 0 and so.ORDER_STATUS = 1) = 0
-        and
-        (select count(sto.PK_ID) from sa_t_order sto where sto.PK_CREATOR = ms.pk_id and sto.del_flag = 0 and sto.ORDER_STATUS = 1) = 0
         )
         <if test="pkMember != null">
             and ms.PK_PARENT = #{pkMember}
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml
index 18076a4b..bb8cbff2 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml
@@ -55,16 +55,6 @@
         and pay_time >=#{startDate, jdbcType=DATE}
         and pay_time &lt; #{endDate, jdbcType=DATE}
         union
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
-               0 CHANGE_TYPE,order_achieve TRADE_ACHIEVE,
-               pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_t_order so
-       left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=0) ca
-                    on so.pk_member = ca.pk_member
-        where so.del_flag=0 and so.order_status=1 and order_type in (21)
-          and so.order_achieve >0
-          and pay_time >=#{startDate, jdbcType=DATE}
-          and pay_time &lt; #{endDate, jdbcType=DATE}
-        union
         select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
                2 CHANGE_TYPE,order_ass_achieve TRADE_ACHIEVE,
                pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_order so
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/BlankRegistrationParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/BlankRegistrationParam.java
deleted file mode 100644
index 028abcc4..00000000
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/BlankRegistrationParam.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.hzs.sale.order.param;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/4/7 9:54
- * @Classname: BlankRegistrationParam
- * @PackageName: com.hzs.sale.order.param
- */
-
-import lombok.Data;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.param
- *@Author: yh
- *@CreateTime: 2023-04-07  09:54
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class BlankRegistrationParam {
-
-    /**
-     * 空单注册基本参数
-     */
-    private  OrderBlankRegParams orderBlankRegParams;
-
-
-
-    /**
-     * 提交方式 （对应枚举EsubmitType）
-     */
-    private Integer processType;
-    /**
-     * 签呈类型
-     */
-    private Integer signType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-    /**
-     * 签呈附件
-     */
-    private List<String> fileList;
-    /**
-     * 业务涨及会员ID列表 --提交审核必传
-     */
-    private Set<Long> pkMemberList;
-
-}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/CuMemberAccountParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/CuMemberAccountParam.java
index 90b6a143..09425afe 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/CuMemberAccountParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/CuMemberAccountParam.java
@@ -6,13 +6,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2022/9/21 17:56
- * @Classname: CuMemberAccountParam
- * @PackageName: com.hzs.sale.order.param
- */
 @Data
 public class CuMemberAccountParam implements Serializable {
 
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderParam.java
deleted file mode 100644
index 82b6cf25..00000000
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderParam.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description: 海粉确认订单入参
- * @Author: jiang chao
- * @Time: 2023/9/7 16:56
- * @Classname: FansConfirmOrder
- * @PackageName: com.hzs.sale.order.param
- */
-@Data
-public class FansConfirmOrderParam {
-
-    /***
-     * 自然国
-     */
-    private Integer pkCountry;
-
-    /**
-     * 会员姓名
-     */
-    private String memberName;
-
-    /**
-     * 联系方式
-     */
-    private String phone;
-
-    /**
-     * 收货人
-     */
-    private String recName;
-
-    /**
-     * 收货电话
-     */
-    private String recPhone;
-
-    /**
-     * 收货省
-     */
-    private Integer recProvince;
-
-    /**
-     * 收货市
-     */
-    private Integer recCity;
-
-    /**
-     * 收货县
-     */
-    private Integer recCounty;
-
-    /**
-     * 收货地址
-     */
-    private String recAddress;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 商品列表
-     */
-    private List<FansConfirmOrderWaresParam> waresList;
-
-}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderSkuParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderSkuParam.java
deleted file mode 100644
index 934dae4c..00000000
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderSkuParam.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.Data;
-
-/**
- * @Description: 海粉确认订单产品入参
- * @Author: jiang chao
- * @Time: 2023/9/7 19:37
- * @Classname: FansConfirmOrderSkuParam
- * @PackageName: com.hzs.sale.order.param
- */
-@Data
-public class FansConfirmOrderSkuParam {
-
-    /**
-     * SKU ID
-     */
-    private Long pkWaresSku;
-
-    /**
-     * 产品数量
-     */
-    private Integer quantity;
-
-}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderWaresParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderWaresParam.java
deleted file mode 100644
index bcfaf348..00000000
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderWaresParam.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description: 海粉确认订单商品入参
- * @Author: jiang chao
- * @Time: 2023/9/7 17:32
- * @Classname: FansConfirmOrderProductParam
- * @PackageName: com.hzs.sale.order.param
- */
-@Data
-public class FansConfirmOrderWaresParam {
-
-    /**
-     * 商品ID
-     */
-    private Integer pkWares;
-
-    /**
-     * 商品数量
-     */
-    private Integer quantity;
-
-    /**
-     * 产品列表
-     */
-    private List<FansConfirmOrderSkuParam> skuList;
-
-}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderGoalsParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderGoalsParam.java
deleted file mode 100644
index 9faf7eaa..00000000
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderGoalsParam.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 订单目标参数
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/5/18 15:37
- * @Classname: OrderGoalsParam
- * @Package_name: com.hzs.sale.order.param
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderGoalsParam implements Serializable {
-    private static final long serialVersionUID = -5753816382872744078L;
-    /**
-     * 会员ID
-     */
-    private Long pkMember;
-    /**
-     * 国家ID
-     */
-    private Integer pkCountry;
-    /**
-     * 开始时间
-     */
-    private String startDate;
-    /**
-     * 结束时间
-     */
-    private String endDate;
-
-    /**
-     * 安置部门
-     */
-    private Integer placeDept;
-}
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/SelfPickUpParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/SelfPickUpParam.java
index 65c124c5..0054ab63 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/SelfPickUpParam.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/SelfPickUpParam.java
@@ -10,12 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @description: 会员端自提
- * @author: sui q
- * @time: 2023/4/19 17:32
- * @classname: SelfPickUpVO
- * @package_name: com.hzs.sale.order.param
- * version 1.0.0
+ * 会员端自提
  */
 @Data
 @Builder
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/SaTOrderQueryVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/SaTOrderQueryVO.java
deleted file mode 100644
index 1158b2c8..00000000
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/SaTOrderQueryVO.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.hzs.sale.order.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hzs.common.core.annotation.Excel;
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description: 查询商品订单VO
- * @Author: jiang chao
- * @Time: 2023/5/29 17:48
- * @Classname: SaTOrderQueryVO
- * @PackageName: com.hzs.sale.order.vo
- */
-@Data
-public class SaTOrderQueryVO {
-
-    /**
-     * 订单ID
-     */
-    private Long pkOrder;
-    /**
-     * 订单明细ID
-     */
-    private Long pkOrderItems;
-
-    /**
-     * 产品名称
-     */
-    @Excel(name = "产品名称")
-    private String productName;
-    /**
-     * 产品规格
-     */
-    @Excel(name = "产品规格")
-    private String specsName;
-    /**
-     * 产品单价
-     */
-    @Excel(name = "产品单价(¥)")
-    private BigDecimal price;
-    /**
-     * 产品业绩
-     */
-    @Excel(name = "产品业绩($)")
-    private BigDecimal achievement;
-
-    /**
-     * 订单状态 (0=待付款,1=已付款,2=已合单,3=待收货,4=已撤单,5=已收货)
-     */
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS)
-    private Integer orderStatus;
-    /**
-     * 订单状态显示
-     */
-    @Excel(name = "发货状态")
-    private String orderStatusVal;
-
-    /**
-     * 物流单号
-     */
-    @Excel(name = "物流单号")
-    private String logisticsCode;
-    /**
-     * 物流公司
-     */
-    @Excel(name = "物流公司")
-    private String logisticsCompany;
-    /**
-     * 产品数量
-     */
-    @Excel(name = "产品数量")
-    private Integer quantity;
-
-    /**
-     * 订单编号
-     */
-    @Excel(name = "订单编号")
-    private String orderCode;
-
-    /**
-     * 会员编号
-     */
-    @Excel(name = "会员编号")
-    private String memberCode;
-
-    /**
-     * 会员名称
-     */
-    @Excel(name = "会员姓名")
-    private String memberName;
-
-    /**
-     * 收货人
-     */
-    @Excel(name = "收货人")
-    private String recName;
-
-    /**
-     * 收货电话
-     */
-    @Excel(name = "联系方式")
-    private String recPhone;
-
-    /**
-     * 省
-     */
-    private Integer recProvince;
-    /**
-     * 省显示
-     */
-    @Excel(name = "省")
-    private String recProvinceVal;
-
-    /**
-     * 市
-     */
-    private Integer recCity;
-    /**
-     * 市显示
-     */
-    @Excel(name = "市")
-    private String recCityVal;
-
-    /**
-     * 县
-     */
-    private Integer recCounty;
-    /**
-     * 县显示
-     */
-    @Excel(name = "区/县")
-    private String recCountyVal;
-
-    /**
-     * 收货地址
-     */
-    @Excel(name = "详细地址")
-    private String recAddress;
-
-    /**
-     * 订单金额
-     */
-    @Excel(name = "订单金额(¥)")
-    private BigDecimal orderAmount;
-
-    /**
-     * 订单业绩
-     */
-    @Excel(name = "订单业绩($)")
-    private BigDecimal orderAchieve;
-
-    /**
-     * 邮费
-     */
-    @Excel(name = "邮费(¥)")
-    private BigDecimal postage;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date creationTime;
-
-    /**
-     * 支付时间
-     */
-    @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date payTime;
-
-
-}