ebay代码调整

data-common/src/main/java/com/bailuntec/domain/dto/DcBaseEbaySkuMappingDto.java

+package com.bailuntec.domain.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class DcBaseEbaySkuMappingDto {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_ebay_sku_mapping.item_id
+     *
+     * @mbg.generated
+     */
+    private String itemId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_ebay_sku_mapping.sku_code
+     *
+     * @mbg.generated
+     */
+    private String skuCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_ebay_sku_mapping.platform_code
+     *
+     * @mbg.generated
+     */
+    private String platformCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_ebay_sku_mapping.has_publish
+     *
+     * @mbg.generated
+     */
+    private Integer hasPublish;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_ebay_sku_mapping.gmt_create
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_ebay_sku_mapping.gmt_modify
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime gmtModify;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_base_ebay_sku_mapping
+     *
+     * @mbg.generated
+     */
+
+    private BigDecimal unitPrice;
+
+
+}
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/dto/DcBaseFinanceEbayItemDto.java

@@ -156,5 +156,5 @@ public class DcBaseFinanceEbayItemDto {
      */
     private Date reportDate;
 
-    private List<DcBaseSkuMappingItemDto> dcBaseSkuMappingList;
+    private List<DcBaseEbaySkuMappingDto> dcBaseSkuMappingList;
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceEbayMapper.xml

@@ -1020,12 +1020,12 @@
         <result column="exchange_rate" jdbcType="DECIMAL" property="exchangeRate" />
         <result column="exchange_rate_usd" jdbcType="DECIMAL" property="exchangeRateUsd" />
         <result column="report_date" jdbcType="DATE" property="reportDate" />
-        <collection property="dcBaseSkuMappingList" column="item_id" ofType="com.bailuntec.domain.dto.DcBaseSkuMappingItemDto" select="selectSkuMapping">
+        <collection property="dcBaseSkuMappingList" column="item_id" ofType="com.bailuntec.domain.dto.DcBaseEbaySkuMappingDto" select="selectSkuMapping">
         </collection>
     </resultMap>
 
-  <select id="selectSkuMapping" resultType="com.bailuntec.domain.dto.DcBaseSkuMappingItemDto">
-        select dc0.*, dc1.unit_price from dc_base_sku_mapping dc0 left join dc_base_sku dc1 on dc0.bailun_sku = dc1.bailun_sku where dc0.item_id = #{itemId} and dc0.has_deleted = 0
+  <select id="selectSkuMapping" resultType="com.bailuntec.domain.dto.DcBaseEbaySkuMappingDto">
+        select dc0.*, dc1.unit_price from dc_base_ebay_sku_mapping dc0 left join dc_base_sku dc1 on dc0.sku_code = dc1.bailun_sku where dc0.item_id = #{itemId}
     </select>
 
   <resultMap id="BaseResultMap2" type="com.bailuntec.domain.dto.DcBaseFinanceEbayItemDto">
@@ -1053,48 +1053,39 @@
   </resultMap>
 
   <!--calculate start-->
-  <select id="selectEbayList" resultMap="BaseResultMap2">
+  <select id="selectEbayList" resultMap="BaseResultMap1">
       select * from dc_base_finance_ebay
       where bj_date &gt;= #{startTime} and bj_date &lt; #{endTime}
       order by id asc
       limit ${pageIndex * pageSize} , #{pageSize}
   </select>
 
-  <select id="selectEbayList1" resultMap="BaseResultMap2">
-      select * from dc_base_finance_ebay
-      where bj_date &gt;= #{startTime} and bj_date &lt; #{endTime}
-      and id &gt;= #{type}
-      order by id asc
-      limit ${pageIndex * pageSize} , #{pageSize}
-  </select>
-
   <select id="selectSkuPrice" resultType="java.math.BigDecimal">
     select unit_price from dc_base_sku where bailun_sku = #{skuCode}
   </select>
   <!--calculate end-->
 
+  <!-- ebayitem start -->
   <select id="countByGroup" resultType="java.lang.Long">
     select count(1) from (select item_id from dc_base_finance_ebay
       where bj_date &gt;= #{startTime} and bj_date &lt; #{endTime} group by item_id) b
   </select>
 
-
-
-  <select id="selectEbayItem" resultType="java.lang.String">
-    select item_id from dc_base_finance_ebay
+  <select id="selectEbay" resultMap="BaseResultMap2">
+    select * from dc_base_finance_ebay
       where bj_date &gt;= #{startTime} and bj_date &lt; #{endTime}
       group by item_id
       order by id asc
       limit ${pageIndex * pageSize} , #{pageSize}
   </select>
 
-
-
-  <select id="selectEbay" resultMap="BaseResultMap2">
-    select * from dc_base_finance_ebay
+  <select id="selectEbayItem" resultType="java.lang.String">
+    select item_id from dc_base_finance_ebay
       where bj_date &gt;= #{startTime} and bj_date &lt; #{endTime}
       group by item_id
       order by id asc
       limit ${pageIndex * pageSize} , #{pageSize}
   </select>
+  <!-- ebayitem end -->
+
 </mapper>
\ No newline at end of file