优化代码，去掉两个字段，增加实际总成本、标准总成本两个字段

src/main/java/com/link/bi/domain/entity/FinanceOrderDetail.java

 package com.link.bi.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.sfa.common.core.web.domain.BaseDo;
 import lombok.Data;
 import org.apache.commons.lang3.ObjectUtils;
 
@@ -19,7 +17,7 @@ import java.util.regex.Pattern;
  */
 @TableName(value = "finance_order_detail")
 @Data
-public class FinanceOrderDetail extends BaseDo {
+public class FinanceOrderDetail   {
     // 订单唯一键
     private Long tradeId;
     // 订单明细唯一键
@@ -33,7 +31,7 @@ public class FinanceOrderDetail extends BaseDo {
     private String srcTid;
     // 赠品方式 0、非赠品
     // 1、自动赠送 2、手工赠送 4、周期购赠送 8、平台赠送 32、阶梯满赠 64、CRM追加赠送 128 主品
-    private Integer giftType;
+//    private Integer giftType;
     // 0:未付款 1:部分付款 2:已付款（原始订单的支付状态）
     private Integer payStatus;
     // 退款状态:
@@ -49,7 +47,7 @@ public class FinanceOrderDetail extends BaseDo {
     // 1、担保
     // 2、非担保
     // 3、在线非担保
-    private Integer guaranteeMode;
+//    private Integer guaranteeMode;
     // 如果没有对应的原始单明细,则返回0.
     // 平台状态:
     // 10、未确认
@@ -267,20 +265,15 @@ public class FinanceOrderDetail extends BaseDo {
     // 标准成本
     private BigDecimal standardCost;
 
-
-    @TableField(exist = false)
-    private BigDecimal shareAmountSum;
-    @TableField(exist = false)
-    private BigDecimal actualCostSum;
-    @TableField(exist = false)
-    private BigDecimal standardCostSum;
-    @TableField(exist = false)
-    private BigDecimal shareAmountDiffSum;
-    @TableField(exist = false)
-    private String queryType;
     // 系列
     private String series;
 
+    // 实际成本*num 实际总成本
+    private BigDecimal sumActualCost;
+    // 标准成本*num  标准总成本
+    private BigDecimal sumStandardCost;
+
+
     /**
      * 是否删除标志0未删除1已删除
      */
@@ -375,6 +368,13 @@ public class FinanceOrderDetail extends BaseDo {
         return null;
     }
 
+    /**
+     * 根据分销商和remark备注信息获取主播Id
+     * @param fenxiaoId
+     * @param remark
+     * @param sameDetail
+     * @return
+     */
     public String getZbjZbId(String fenxiaoId, String remark, FinanceOrderDetail sameDetail) {
         if (ObjectUtils.isNotEmpty(fenxiaoId)) {
             return fenxiaoId;

src/main/java/com/link/bi/pojo/response/FinanceBiListDto.java

@@ -33,8 +33,10 @@ public class FinanceBiListDto {
     private BigDecimal actualCostSum;
     // 标准成本
     private BigDecimal standardCostSum;
+
     // 实际成本毛利
     private BigDecimal actualCostGrossProfitSum;
+
     // 标准成本毛利
     private BigDecimal standardCostGrossProfitSum;
 }

src/main/java/com/link/bi/service/impl/FinanceOrderDetailServiceImpl.java

@@ -62,6 +62,9 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
         pageInfo.setList(orderDetailPageInfo.getList().stream().map(item -> {
             FinanceBiListDto dto = new FinanceBiListDto();
             BeanUtils.copyProperties(item, dto);
+            dto.setActualCostSum(item.getSumActualCost());
+            dto.setStandardCostSum(item.getSumStandardCost());
+
             dto.setActualCostGrossProfitSum(dto.getShareAmountSum().subtract(dto.getActualCostSum()));
             dto.setStandardCostGrossProfitSum(dto.getShareAmountSum().subtract(dto.getStandardCostSum()));
             dto.setUid(IdUtil.simpleUUID());

src/main/resources/mapper/bi/FinanceOrderDetailMapper.xml

@@ -165,10 +165,8 @@
                platform_id,
                src_oid,
                src_tid,
-               gift_type,
                pay_status,
                refund_status,
-               guarantee_mode,
                platform_status,
                delivery_term,
                num,
@@ -228,11 +226,7 @@
                fenxiao_name,
                batch_no,
                del_flag,
-               create_by,
-               create_user_id,
                create_time,
-               update_by,
-               update_user_id,
                update_time,
                start_time,
                end_time,
@@ -271,7 +265,7 @@
         trade_no
         ,shop_name,src_tid,src_oid,trade_status,trade_time,pay_time,consign_time,receiver_area,
             remark,receivable,goods_no,goods_name,spec_name,goods_type,num,discount,share_amount,suite_no,
-            suite_name,suite_num,gift_type,fenxiao_name,fenxiao_id,api_goods_name
+            suite_name,suite_num, fenxiao_name,fenxiao_id,api_goods_name
 
     </sql>
 
@@ -283,10 +277,8 @@
         <result column="platform_id" property="platformId" jdbcType="INTEGER"/>
         <result column="src_oid" property="srcOid" jdbcType="VARCHAR"/>
         <result column="src_tid" property="srcTid" jdbcType="VARCHAR"/>
-        <result column="gift_type" property="giftType" jdbcType="INTEGER"/>
         <result column="pay_status" property="payStatus" jdbcType="INTEGER"/>
         <result column="refund_status" property="refundStatus" jdbcType="INTEGER"/>
-        <result column="guarantee_mode" property="guaranteeMode" jdbcType="INTEGER"/>
         <result column="platform_status" property="platformStatus" jdbcType="INTEGER"/>
         <result column="delivery_term" property="deliveryTerm" jdbcType="INTEGER"/>
         <result column="num" property="num" jdbcType="DECIMAL"/>
@@ -345,11 +337,7 @@
         <result column="fenxiao_name" property="fenxiaoName" jdbcType="VARCHAR"/>
         <result column="batch_no" property="batchNo" jdbcType="VARCHAR"/>
         <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
-        <result column="create_user_id" property="createUserId" jdbcType="BIGINT"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
-        <result column="update_user_id" property="updateUserId" jdbcType="BIGINT"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
         <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
@@ -372,11 +360,5 @@
         <result column="actual_cost" property="actualCost" jdbcType="DECIMAL"/>
         <result column="standard_cost" property="standardCost" jdbcType="DECIMAL"/>
 
-
-        <result column="share_amount_sum" property="shareAmountSum" jdbcType="DECIMAL"/>
-        <result column="actual_cost_sum" property="actualCostSum" jdbcType="DECIMAL"/>
-        <result column="standard_cost_sum" property="standardCostSum" jdbcType="DECIMAL"/>
-        <result column="share_amount_diff_sum" property="shareAmountDiffSum" jdbcType="DECIMAL"/>
-        <result column="query_type" property="queryType" jdbcType="VARCHAR"/>
     </resultMap>
 </mapper>