fix

data-base/base-sync-finance-wish/src/main/java/com/bailuntec/job/FBWFeeSyncJob.java

@@ -5,29 +5,22 @@ import com.alibaba.fastjson.JSON;
 import com.bailuntec.domain.FBWFeeInfo;
 import com.bailuntec.domain.WishAuth;
 import com.bailuntec.domain.WishExceptionInfo;
-import com.bailuntec.domain.WishInfo;
 import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.entity.*;
-import com.bailuntec.domain.enumerate.AccountPlatformType;
 import com.bailuntec.domain.enumerate.CurrencyType;
-import com.bailuntec.domain.example.*;
 import com.bailuntec.mapper.*;
 import com.bailuntec.support.CallBailunSystem;
-import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.OkHttpUtil;
 import com.bailuntec.utils.PropertiesUtil;
 import com.bailuntec.utils.SessionUtil;
-import com.dangdang.ddframe.job.api.ShardingContext;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.List;

data-base/base-sync-finance-wish/src/main/java/com/bailuntec/job/WishSyncJob.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.bailuntec.domain.WishAuth;
 import com.bailuntec.domain.WishExceptionInfo;
 import com.bailuntec.domain.WishInfo;
-import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.entity.*;
 import com.bailuntec.domain.enumerate.AccountPlatformType;
 import com.bailuntec.domain.enumerate.CurrencyType;
@@ -26,7 +25,6 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiStockProdDailySyncJob.java

 package com.bailuntec.job;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.bailuntec.domain.entity.DcSemiStockProd;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.pojo.SemiStockReportInfo;
 import com.bailuntec.mapper.DcSemiStockProdMapper;
-import com.bailuntec.mapper.JobPointLogMapper;
 import com.bailuntec.support.PointJob;
-import com.bailuntec.utils.ExceptionUtil;
-import com.bailuntec.utils.OkHttpUtil;
-import com.bailuntec.utils.PropertiesUtil;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.LinkedHashMap;
-import java.util.List;
 
 @Slf4j
 public class SemiStockProdDailySyncJob extends PointJob {

data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiStockProdSyncJob.java

@@ -3,13 +3,10 @@ package com.bailuntec.job;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.entity.DcSemiStockProd;
-import com.bailuntec.domain.entity.DcSemiStockReport;
 import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.domain.pojo.SemiStockReportInfo;
 import com.bailuntec.mapper.DcSemiStockProdMapper;
-import com.bailuntec.mapper.DcSemiStockReportMapper;
 import com.bailuntec.mapper.JobPointLogMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.ExceptionUtil;
@@ -25,7 +22,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.List;
 

data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiStockReportSyncJob.java

 package com.bailuntec.job;
 
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.bailuntec.domain.constant.CommonConstant;

data-base/base-sync-shopify/src/test/java/com/bailuntec/ApplicationTest.java

@@ -4,7 +4,6 @@ import com.bailuntec.domain.entity.JobAccountLog;
 import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.domain.enumerate.AccountPlatformType;
 import com.bailuntec.domain.example.JobAccountLogExample;
-import com.bailuntec.job.ShopifySyncJob;
 import com.bailuntec.mapper.JobAccountLogMapper;
 import com.bailuntec.utils.SessionUtil;
 import lombok.extern.slf4j.Slf4j;

data-base/base-sync-sku/pom.xml

@@ -33,26 +33,57 @@
     </dependencies>
     <build>
         <plugins>
+
+            <!--maven编译插件-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <!--指定编译jdk版本-->
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
             </plugin>
 
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
                 <configuration>
-                    <mainClass>com.bailuntec.Application</mainClass>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.bailuntec.Application</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>repackage</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
 
+
+            <!--测试用例插件-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <!-- 跳过测试-->
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
             <!-- docker的maven插件，官网：https://github.com/spotify/docker-maven-plugin -->
             <plugin>
                 <groupId>com.spotify</groupId>

data-base/base-sync-sku/src/test/java/SyncSkuTest.java

@@ -3,7 +3,10 @@ import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.domain.request.SkuCondition;
 import com.bailuntec.domain.request.SkumsRequest;
 import com.bailuntec.job.SkuMSSyncJob;
+import com.bailuntec.mapper.DcBaseSkuMapper;
+import com.bailuntec.mapper.JobPointLogMapper;
 import com.bailuntec.utils.OkHttpUtil;
+import com.bailuntec.utils.SessionUtil;
 import okhttp3.*;
 import org.junit.jupiter.api.Test;
 
@@ -15,6 +18,12 @@ public class SyncSkuTest {
     private OkHttpClient client = OkHttpUtil.getInstance();
 
     @Test
+    public void getMapper(){
+        JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
+        JobPointLog log = mapper.selectByPrimaryKey(41);
+    }
+
+    @Test
     public void test() {
         SkuMSSyncJob skuSyncJob = new SkuMSSyncJob();
         skuSyncJob.executeJob(null, new JobPointLog("base-sku", 1, 100, 1, 1,

data-base/base-sync-stock-wms/src/main/java/com/bailuntec/job/WmsLogisticsReconciliationJob.java

@@ -3,7 +3,6 @@ package com.bailuntec.job;
 import com.alibaba.fastjson.JSON;
 import com.bailuntec.domain.entity.DcBaseLogisticsReconciliation;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.example.DcBaseLogisticsExample;
 import com.bailuntec.domain.example.DcBaseLogisticsReconciliationExample;
 import com.bailuntec.domain.pojo.LogisticsReconciliation;
 import com.bailuntec.domain.pojo.WmsLogisticsReconciliationInfo;

data-base/pom.xml

@@ -18,7 +18,7 @@
         <module>base-sync-purchase</module>
         <module>base-sync-warehouse</module>
         <module>base-sync-stock-wms</module>
-        <!--        <module>base-sync-sku</module>-->
+        <module>base-sync-sku</module>
         <module>base-sync-crm-refund</module>
         <module>base-sync-cost-first</module>
         <module>base-sync-finance-ebay</module>

data-common/pom.xml

@@ -117,9 +117,32 @@
 
     <build>
         <plugins>
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>-->
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+            </plugin>-->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
+                </configuration>
             </plugin>
 
             <plugin>

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseSkuMapping.java

@@ -230,6 +230,11 @@ public class DcBaseSkuMapping {
     private LocalDateTime gmtModified;
 
     /**
+     * 产品线名称
+     */
+    private String productLineName;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_sku_mapping
      *
@@ -265,6 +270,7 @@ public class DcBaseSkuMapping {
         sb.append(", companyId=").append(companyId);
         sb.append(", gmtCreate=").append(gmtCreate);
         sb.append(", gmtModified=").append(gmtModified);
+        sb.append(", productLineName=").append(productLineName);
         sb.append("]");
         return sb.toString();
     }
@@ -310,7 +316,8 @@ public class DcBaseSkuMapping {
             && (this.getHasDeleted() == null ? other.getHasDeleted() == null : this.getHasDeleted().equals(other.getHasDeleted()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
             && (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate()))
-            && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()));
+            && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
+            && (this.getProductLineName() == null ? other.getProductLineName() == null : this.getProductLineName().equals(other.getProductLineName()));
     }
 
     /**
@@ -347,6 +354,7 @@ public class DcBaseSkuMapping {
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getGmtCreate() == null) ? 0 : getGmtCreate().hashCode());
         result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
+        result = prime * result + ((getProductLineName() == null) ? 0 : getProductLineName().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/DcBaseCrmRefundMapper.java

@@ -4,7 +4,6 @@ import com.bailuntec.domain.entity.DcBaseCrmRefund;
 import com.bailuntec.domain.example.DcBaseCrmRefundExample;
 import org.apache.ibatis.annotations.Param;
 
-import java.time.LocalDate;
 import java.util.List;
 
 public interface DcBaseCrmRefundMapper {

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

@@ -30,6 +30,7 @@
         <result column="company_id" jdbcType="INTEGER" property="companyId"/>
         <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate"/>
         <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified"/>
+        <result column="product_line_name" jdbcType="VARCHAR" property="productLineName"/>
     </resultMap>
     <sql id="Example_Where_Clause">
         <!--
@@ -661,6 +662,9 @@
             <if test="gmtModified != null">
                 gmt_modified,
             </if>
+            <if test="productLineName != null">
+                product_line_name,
+            </if>
         </trim>
         values
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -736,6 +740,9 @@
             <if test="gmtModified != null">
                 #{gmtModified,jdbcType=TIMESTAMP},
             </if>
+            <if test="productLineName != null">
+                #{productLineName,jdbcType=VARCHAR},
+            </if>
         </trim>
         on duplicate key update
         <trim suffixOverrides=",">
@@ -811,6 +818,9 @@
             <if test="gmtModified != null">
                 gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
             </if>
+            <if test="productLineName != null">
+                productLineName = #{productLineName,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseSkuMapping">

data-common/src/main/java/com/bailuntec/mapper/DcDailyTransitFromMapper.java

@@ -6,7 +6,6 @@ import com.bailuntec.domain.example.DcDailyTransitFromExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 public interface DcDailyTransitFromMapper {

data-common/src/test/java/excel/costfirst/CostFirstListener.java

@@ -16,8 +16,6 @@ import org.apache.ibatis.session.SqlSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

data-finance/finance-balance-sheet/src/test/java/com/bailuntec/balancesheet/service/BalanceSheetServiceTest.java

@@ -11,11 +11,13 @@ import com.bailuntec.balancesheet.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -78,7 +80,7 @@ public class BalanceSheetServiceTest {
         try {
             balanceSheetService.doScheduledTask0000();
         } catch (Exception e) {
-            log.error(e.getMessage());
+            //log.error(e.getMessage());
         }
     }
 
@@ -186,8 +188,8 @@ public class BalanceSheetServiceTest {
         /*Date startDate = DateTimeUtil.stringToDate("2014-04-25", DateTimeUtil.DATE_FORMAT);
         Date endDate = DateTimeUtil.stringToDate("2018-08-06", DateTimeUtil.DATE_FORMAT);
         balanceSheetService.getSemiInventoryBalance(startDate,endDate);*/
-        Date startDate = DateTimeUtil.stringToDate("2020-10-19", DateTimeUtil.DATE_FORMAT);
-        Date endDate = DateTimeUtil.stringToDate("2020-11-02", DateTimeUtil.DATE_FORMAT);
+        Date startDate = DateTimeUtil.stringToDate("2021-03-01", DateTimeUtil.DATE_FORMAT);
+        Date endDate = DateTimeUtil.stringToDate("2021-03-31", DateTimeUtil.DATE_FORMAT);
         assert endDate != null;
         assert startDate != null;
         while (startDate.compareTo(endDate) < 0) {

data-mid/mid-calculate-item/src/main/java/com/bailuntec/job/CalculateAmazonItemJob.java

@@ -4,10 +4,8 @@ import com.bailuntec.domain.dto.DcBaseFinanceAmazonItemDto;
 import com.bailuntec.domain.dto.DcBaseSkuMappingItemDto;
 import com.bailuntec.domain.entity.*;
 import com.bailuntec.domain.example.DcBaseFinanceAmazonAdProductExample;
-import com.bailuntec.domain.example.DcBaseFinanceAmazonExample;
 import com.bailuntec.mapper.DcBaseFinanceAmazonAdProductMapper;
 import com.bailuntec.mapper.DcBaseFinanceAmazonItemMapper;
-import com.bailuntec.mapper.DcBaseFinanceAmazonMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;

data-mid/mid-calculate-item/src/main/java/com/bailuntec/job/CalculateEbaySkuRatioJob.java

@@ -6,13 +6,9 @@ import com.bailuntec.domain.dto.DcBaseEbaySkuMappingDto;
 import com.bailuntec.domain.dto.DcBaseFinanceEbayItemDto;
 import com.bailuntec.domain.entity.DcBaseEbaySkuMapping;
 import com.bailuntec.domain.entity.DcBaseEbaySkuRatio;
-import com.bailuntec.domain.entity.DcBaseFinanceEbayItem;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.example.DcBaseFinanceEbayExample;
-import com.bailuntec.domain.example.DcBaseFinanceEbayItemExample;
 import com.bailuntec.mapper.DcBaseEbaySkuMappingMapper;
 import com.bailuntec.mapper.DcBaseEbaySkuRatioMapper;
-import com.bailuntec.mapper.DcBaseFinanceEbayItemMapper;
 import com.bailuntec.mapper.DcBaseFinanceEbayMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.OkHttpUtil;
@@ -21,7 +17,6 @@ import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;

data-mid/mid-daily-stock/src/main/java/com/bailuntec/job/DailyTransferJob.java

@@ -2,10 +2,7 @@ package com.bailuntec.job;
 
 import com.bailuntec.domain.dto.TransferTransitQuantity;
 import com.bailuntec.domain.entity.DcDailyTransitFrom;
-import com.bailuntec.mapper.DcBaseStockMapper;
-import com.bailuntec.mapper.DcBaseTransferCompleteMapper;
 import com.bailuntec.mapper.DcDailyTransitFromMapper;
-import com.bailuntec.mapper.DcMidTransitMapper;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;
@@ -14,10 +11,6 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.TransactionIsolationLevel;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 @Slf4j

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -8,7 +8,6 @@ import com.bailuntec.domain.entity.*;
 import com.bailuntec.domain.example.DcAutoTurnoverExample;
 import com.bailuntec.domain.example.DcBaseStockExample;
 import com.bailuntec.domain.example.DcMidTransitExample;
-import com.bailuntec.domain.example.DcReportProfitAnalysisExample;
 import com.bailuntec.excel.DcAutoTurnoverExcel;
 import com.bailuntec.excel.ExcelListener;
 import com.bailuntec.job.AutoTurnoverJob;
@@ -76,7 +75,7 @@ public class AutoTurnoverTest {
         DcBaseStock dcBaseStock = null;
         try {
             DcBaseStockMapper mapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
-            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("229354801").andWarehouseCodeEqualTo("YHUSFBA").example());
+            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("953872601").andWarehouseCodeEqualTo("GZBLWH").example());
         } catch (Exception e) {
             e.printStackTrace();
         } finally {