fix

datacenter-domain/src/main/java/com/bailuntec/domain/DcLogisticsSupplierTransaction.java

+package com.bailuntec.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DcLogisticsSupplierTransaction对象", description="物流供应商往来数据表")
+public class DcLogisticsSupplierTransaction implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "供应商ID")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty(value = "公司主体value")
+    private Integer payCompanyValue;
+
+    @ApiModelProperty(value = "公司主体名称")
+    private String payCompanyName;
+
+    @ApiModelProperty(value = "期初金额")
+    private BigDecimal startAmount;
+
+    @ApiModelProperty(value = "期末金额")
+    private BigDecimal endAmount;
+
+    @ApiModelProperty(value = "")
+    private BigDecimal borrowAmount;
+
+    @ApiModelProperty(value = "期末金额")
+    private BigDecimal loanAmount;
+
+    @ApiModelProperty(value = "供应商类型")
+    private String type;
+
+    @ApiModelProperty(value = "统计日期")
+    private LocalDate day;
+}

datacenter-domain/src/main/java/com/bailuntec/domain/DcSemiPurchaseDetail.java

+package com.bailuntec.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DcSemiPurchaseDetail对象", description="半成品采购明细表")
+public class DcSemiPurchaseDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "采购单ID")
+    private Integer buyId;
+
+    @ApiModelProperty(value = "采购明细ID")
+    private Integer detailId;
+
+    @ApiModelProperty(value = "采购单编号")
+    private String buyNo;
+
+    @ApiModelProperty(value = "供应商ID")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty(value = "sku编码")
+    private String skuCode;
+
+    @ApiModelProperty(value = "sku名称")
+    private String skuName;
+
+    @ApiModelProperty(value = "仓库ID")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "在途数量")
+    private BigDecimal transferQuantity;
+
+    @ApiModelProperty(value = "采购单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "半成品系统最后更新时间")
+    private Date semiUpdateDate;
+
+    @ApiModelProperty(value = "sku是否从采购单移除：0-否，1-是")
+    private Integer skuDelStatus;
+
+    @ApiModelProperty(value = "采购单是否作废：0-否，1-是")
+    private Integer purchaseDelStatus;
+}

datacenter-domain/src/main/java/com/bailuntec/domain/DcSupplierTransaction.java

+package com.bailuntec.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="DcSupplierTransaction对象", description="供应商往来数据表(应付账款和预付账款)")
+public class DcSupplierTransaction {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "公司主体value")
+    private Integer payCompanyValue;
+
+    @ApiModelProperty(value = "公司主体名称")
+    private String payCompanyName;
+
+    @ApiModelProperty(value = "供应商ID")
+    private Integer supplierId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty(value = "成品1级供应商数据：1级供应商本身；成品2级供应商数据：对应一级供应商；半成品2级供应商数据：对应付款主体")
+    private Integer parentSupplierId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String parentSupplierName;
+
+    @ApiModelProperty(value = "入库金额")
+    private BigDecimal puttingAmount;
+
+    @ApiModelProperty(value = "快递费")
+    private BigDecimal expressAmount;
+
+    @ApiModelProperty(value = "支付金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "退货金额")
+    private BigDecimal returnAmount;
+
+    @ApiModelProperty(value = "退货运费")
+    private BigDecimal returnExpress;
+
+    @ApiModelProperty(value = "收款金额")
+    private BigDecimal receiveAmount;
+
+    @ApiModelProperty(value = "调整金额")
+    private BigDecimal adjustAmount;
+
+    @ApiModelProperty(value = "期初金额")
+    private BigDecimal startAmount;
+
+    @ApiModelProperty(value = "期末金额")
+    private BigDecimal endAmount;
+
+    @ApiModelProperty(value = "统计日期")
+    private LocalDateTime day;
+
+    @ApiModelProperty(value = "1：一级供应商，2：二级供应商")
+    private Integer types;
+
+    @ApiModelProperty(value = "0：半成品仓，1：成品仓")
+    private Integer isFinish;
+
+    @ApiModelProperty(value = "逾期未付款金额")
+    private BigDecimal delayNoPayAmount;
+}

datacenter-domain/src/main/java/com/bailuntec/infrastructure/mapper/DcBalanceSheetMapper.java

@@ -2,6 +2,8 @@ package com.bailuntec.infrastructure.mapper;
 
 import com.bailuntec.domain.DcBalanceSheet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -17,6 +19,12 @@ import java.time.LocalDate;
  */
 public interface DcBalanceSheetMapper extends BaseMapper<DcBalanceSheet> {
 
+    @Insert("insert into dc_balance_sheet(company_value,company_name,statistical_time) values (#{companyValue},#{companyName},#{lastDay})")
+    Integer insertBalanceSheet(@Param("companyValue") Integer companyValue, @Param("companyName") String companyName, @Param("lastDay") LocalDate lastDay);
+
+    @Select("select * from dc_balance_sheet where statistical_time = #{lastDay} and company_value = #{companyValue} and company_name = #{companyName} limit 1")
+    DcBalanceSheet getDcBalanceSheetInit(@Param("companyValue") Integer companyValue, @Param("companyName") String companyName, @Param("lastDay") LocalDate lastDay);
+
     @Select("select platform_balance from dc_balance_sheet where statistical_time = #{lastDay}")
     BigDecimal getPlatformBalanceUpdate(LocalDate lastDay);
 
@@ -28,4 +36,24 @@ public interface DcBalanceSheetMapper extends BaseMapper<DcBalanceSheet> {
 
     @Select("select ifnull(sum(fixed_assets_import),0) from dc_balance_sheet where statistical_time = #{lastDay}")
     BigDecimal getFixedAssetsImport(LocalDate lastDay);
+
+    @Select("select finished_accounts_payable from dc_balance_sheet where statistical_time <= #{lastDay} and finished_accounts_payable > 0 order by finished_accounts_payable desc limit 1 ")
+    BigDecimal getFinashedAccountSumByOld(@Param("lastDay") LocalDate lastDay);
+
+    @Select({"select logistics_accounts_payable from dc_balance_sheet where statistical_time = #{date}"})
+    BigDecimal getLogisticsAccountsPayableInit(@Param("date") LocalDate date);
+
+    @Select({"select finished_accounts_payable from dc_balance_sheet where statistical_time = #{date}"})
+    BigDecimal getLogisticsAccountsPayableSum(@Param("date") LocalDate date);
+
+    @Select("select finished_accounts_payable from dc_balance_sheet where statistical_time <= #{date} and finished_accounts_payable > 0 order by finished_accounts_payable desc limit 1 ")
+    BigDecimal getLogisticsAccountsPayableSumByOld(@Param("date") LocalDate date);
+
+    @Select("select accounts_receivable_import from dc_balance_sheet where statistical_time = #{lastDay} ")
+    BigDecimal getAccountsReceivableImport(@Param("lastDay") LocalDate lastDay);
+
+    @Select("select accounts_receivable_update from dc_balance_sheet where statistical_time = #{lastDay} ")
+    BigDecimal getAccountsReceivableUpdate(@Param("lastDay") LocalDate lastDay);
+
+    int updateByCompanyAndDaySelective(DcBalanceSheet dcBalanceSheet);
 }

datacenter-domain/src/main/java/com/bailuntec/infrastructure/mapper/DcInventoryBalanceMapper.java

@@ -25,7 +25,7 @@ public interface DcInventoryBalanceMapper extends BaseMapper<DcInventoryBalance>
     void deleteInventoryBalance(LocalDate lastDay);
 
     //插入库存明细
-    @Insert("insert into dc_inventory_balance(warehouse_code,warehouse_name,hq_type,balance_rmb,statistical_time,is_transfer)" +
+    @Insert("insert ignore into dc_inventory_balance(warehouse_code,warehouse_name,hq_type,balance_rmb,statistical_time,is_transfer)" +
             " select ds.warehouse_code,w.warehouse_name,w.hq_type,sum(ds.unit_price * (ds.usable_stock + ds.occupy_stock)),#{lastDay},0" +
             " from dc_daily_stock ds left join dc_base_sku s on ds.bailun_sku = s.bailun_sku" +
             " left join dc_base_warehouse w on ds.warehouse_code = w.warehouse_code" +
@@ -34,7 +34,7 @@ public interface DcInventoryBalanceMapper extends BaseMapper<DcInventoryBalance>
     void insertInventoryBalance(@Param("lastDay") LocalDate lastDay);
 
     //插入调拨在途明细
-    @Insert("insert into dc_inventory_balance(warehouse_code,warehouse_name,hq_type,balance_rmb,statistical_time,is_transfer,transfer_rmb,transfer_plan_rmb,purchase_rmb)" +
+    @Insert("insert ignore into dc_inventory_balance(warehouse_code,warehouse_name,hq_type,balance_rmb,statistical_time,is_transfer,transfer_rmb,transfer_plan_rmb,purchase_rmb)" +
             " select t.warehouse_code,w.warehouse_name,w.hq_type,sum((t.unit_price * t.quantity_transfer) + (t.unit_price * t.quantity_purchase))," +
             "#{lastDay},1,sum(t.unit_price * (t.quantity_transfer - t.quantity_transfer_plan)),sum(t.unit_price * t.quantity_transfer_plan)," +
             "sum(t.unit_price * t.quantity_purchase)" +

datacenter-domain/src/main/java/com/bailuntec/infrastructure/mapper/DcLogisticsSupplierTransactionMapper.java

+package com.bailuntec.infrastructure.mapper;
+
+import com.bailuntec.api.bailuntec.purchase.resp.LogisticsSupplierTransactionDTO;
+import com.bailuntec.domain.DcLogisticsSupplierTransaction;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+public interface DcLogisticsSupplierTransactionMapper extends BaseMapper<DcLogisticsSupplierTransaction> {
+    @Insert("<script>" +
+            "insert into dc_logistics_supplier_transaction(day,type,pay_company_value,pay_company_name,supplier_id,supplier_name,start_amount," +
+            "borrow_amount,loan_amount,end_amount) values" +
+            "<foreach collection='list' item='item' index='index' separator=','>" +
+            "(#{item.day},#{item.type},#{item.payCompanyValue},#{item.payCompanyName},#{item.supplierId},#{item.supplierName},#{item.startAmount}," +
+            "#{item.borrowAmount},#{item.loanAmount},#{item.endAmount})" +
+            "</foreach>" +
+            "on duplicate key update type=values(type),pay_company_value=values(pay_company_value),pay_company_name=values(pay_company_name)," +
+            "supplier_id=values(supplier_id),supplier_name=values(supplier_name),start_amount=values(start_amount),borrow_amount=values(borrow_amount)," +
+            "loan_amount = values(loan_amount),end_amount = values(end_amount)" +
+            "</script>")
+    void insertOrUpdateLogisticsSupplierTransaction(List<LogisticsSupplierTransactionDTO> list);
+
+    /**
+     * 物流应付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_logistics_supplier_transaction where day = #{lastDay} and end_amount > 0")
+    BigDecimal getLogisticsAccountsPayableSum(@Param("lastDay") LocalDate lastDay);
+
+    /**
+     * 物流预付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_logistics_supplier_transaction where day = #{lastDay} and end_amount < 0")
+    BigDecimal getLogisticsPrepaymentSum(@Param("lastDay") LocalDate lastDay);
+}

datacenter-domain/src/main/java/com/bailuntec/infrastructure/mapper/DcSemiDailyTransferMapper.java

@@ -2,12 +2,12 @@ package com.bailuntec.infrastructure.mapper;
 
 import com.bailuntec.domain.DcSemiDailyTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * <p>
@@ -27,4 +27,11 @@ public interface DcSemiDailyTransferMapper extends BaseMapper<DcSemiDailyTransfe
 
     @Select("select ifnull(sum(transfer_quantity * unit_price),0) from dc_semi_daily_transfer where day = #{lastDay} and warehouse_id in (16,9)")
     BigDecimal getSemiHaNiDailyTransferSum(@Param("lastDay") LocalDate lastDay);
+
+    @Insert("<script>" +
+            "insert ignore into dc_semi_daily_transfer(day,buy_id,detail_id,buy_no,supplier_id,supplier_name,sku_code,sku_name,warehouse_id,warehouse_name,transfer_quantity,unit_price,semi_update_date) " +
+            "select #{lastDay},buy_id,detail_id,buy_no,supplier_id,supplier_name,sku_code,sku_name,warehouse_id,warehouse_name,transfer_quantity,unit_price,semi_update_date " +
+            "from dc_semi_purchase_detail where transfer_quantity > 0 and sku_del_status=0 and purchase_del_status=0" +
+            "</script>")
+    void insertSemiDailyTransfer(@Param("lastDay") LocalDate lastDay);
 }

datacenter-domain/src/main/java/com/bailuntec/infrastructure/mapper/DcSemiPurchaseDetailMapper.java

+package com.bailuntec.infrastructure.mapper;
+
+import com.bailuntec.api.bailuntec.mjcg.resp.SemiPurchaseDetailDTO;
+import com.bailuntec.domain.DcSemiPurchaseDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+
+import java.util.List;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+public interface DcSemiPurchaseDetailMapper extends BaseMapper<DcSemiPurchaseDetail> {
+    @Insert("<script>" +
+            "insert into dc_semi_purchase_detail(buy_id,detail_id,buy_no,supplier_id,supplier_name,sku_code,sku_name,warehouse_id,warehouse_name,transfer_quantity," +
+            "unit_price,semi_update_date,sku_del_status,purchase_del_status) values" +
+            "<foreach collection='list' item='item' index='index' separator=','>" +
+            "(#{item.buyId},#{item.detailId},#{item.buyNo},#{item.supplierId},#{item.supplierName},#{item.skuCode},#{item.skuName},#{item.warehouseId},#{item.warehouseName}," +
+            "#{item.transferQuantity},#{item.unitPrice},#{item.semiUpdateDate},#{item.skuDelStatus},#{item.purchaseDelStatus})" +
+            "</foreach>" +
+            " on duplicate key update buy_id=values(buy_id),buy_no=values(buy_no),supplier_id=values(supplier_id),supplier_name=values(supplier_name)," +
+            "sku_code=values(sku_code),sku_name=values(sku_name),warehouse_id=values(warehouse_id),warehouse_name=values(warehouse_name)," +
+            "transfer_quantity=values(transfer_quantity),unit_price=values(unit_price),semi_update_date=values(semi_update_date),sku_del_status=values(sku_del_status)," +
+            "purchase_del_status=values(purchase_del_status)" +
+            "</script>")
+    void insertOrUpdateSemiPurchaseDetail(List<SemiPurchaseDetailDTO> semiPurchaseDetailDTOList);
+}

datacenter-domain/src/main/java/com/bailuntec/infrastructure/mapper/DcSupplierTransactionMapper.java

+package com.bailuntec.infrastructure.mapper;
+
+import com.bailuntec.api.bailuntec.purchase.resp.SupplierTransactionDTO;
+import com.bailuntec.domain.DcSupplierTransaction;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+public interface DcSupplierTransactionMapper extends BaseMapper<DcSupplierTransaction> {
+
+    @Insert("<script>" +
+            "insert into dc_supplier_transaction(day,types,is_finish,pay_company_value,pay_company_name,supplier_id,supplier_name,parent_supplier_id,parent_supplier_name," +
+            "start_amount,putting_amount,express_amount,pay_amount,return_amount,return_express,receive_amount,adjust_amount,end_amount,delay_no_pay_amount) values" +
+            "<foreach collection='list' item='item' index='index' separator=','>" +
+            "(#{item.day},#{item.types},#{item.isFinish},#{item.payCompanyValue},#{item.payCompanyName},#{item.supplierId},#{item.supplierName}," +
+            "#{item.parentSupplierId},#{item.parentSupplierName},#{item.startAmount},#{item.puttingAmount},#{item.expressAmount},#{item.payAmount},#{item.returnAmount}," +
+            "#{item.returnExpress},#{item.receiveAmount},#{item.adjustAmount},#{item.endAmount},#{item.delayNoPayAmount})" +
+            "</foreach>" +
+            "on duplicate key update types=values(types),is_finish=values(is_finish),pay_company_value=values(pay_company_value),pay_company_name=values(pay_company_name)," +
+            "supplier_id=values(supplier_id),supplier_name=values(supplier_name),parent_supplier_id=values(parent_supplier_id),parent_supplier_name=values(parent_supplier_name)," +
+            "start_amount=values(start_amount),putting_amount=values(putting_amount),express_amount = values(express_amount),pay_amount = values(pay_amount)," +
+            "return_amount = values(return_amount),return_express = values(return_express),receive_amount = values(receive_amount),adjust_amount = values(adjust_amount)," +
+            "end_amount = values(end_amount),delay_no_pay_amount = values(delay_no_pay_amount)" +
+            "</script>")
+    void insertOrUpdateSupplierTransaction(List<SupplierTransactionDTO> dcSupplierTransactions);
+
+    /**
+     * 应付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount > 0 and types = 2")
+    BigDecimal getAccountsPayableSum(@Param("lastDay") LocalDate lastDay);
+
+    /**
+     * 预付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount < 0 and types = 2")
+    BigDecimal getPrepaymentSum(@Param("lastDay") LocalDate lastDay);
+
+    /**
+     * 成品应付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount > 0 and is_finish = 1 and types = 2")
+    BigDecimal getFinishedAccountsPayableSum(@Param("lastDay") LocalDate lastDay);
+
+    @Select("select sum(case when platform not in ('Ebay', 'shopify') then amount_end else 0 end) - sum(case when platform in ('Ebay', 'shopify') then amount_end else 0 end) from dc_daily_receivable where day = #{lastDay}")
+    BigDecimal getAccountsReceivable(@Param("lastDay") LocalDate lastDay);
+
+    /**
+     * 成品预付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount < 0 and is_finish = 1 and types = 2")
+    BigDecimal getFinishedPrepaymentSum(@Param("lastDay") LocalDate lastDay);
+
+    /**
+     * 半成品应付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount > 0 and is_finish = 0 and types = 2")
+    BigDecimal getSemiAccountsPayableSum(@Param("lastDay") LocalDate lastDay);
+
+    /**
+     * 半成品预付款项汇总
+     * @return
+     */
+    @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount < 0 and is_finish = 0 and types = 2")
+    BigDecimal getSemiPrepaymentSum(@Param("lastDay") LocalDate lastDay);
+
+}

datacenter-job/datacenter-base/base-sync-ebay-transaction/src/main/java/com/bailuntec/job/service/impl/SyncEbayFeeServiceImpl.java

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +43,11 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
 
     //当前需要跑的账号
     private final static String[] RUN_ACCOUNT = new String[]{"ottlueilwitz3", "jalenhe", "uha4mmada", "rownmelody5",
-            "nthonyp6ecket", "rayallen9", "barbara_spence95", "nbrysonhall", "credit4free", "barbara_spence95"};
+            "nthonyp6ecket", "rayallen9", "barbara_spence95", "nbrysonhall", "credit4free", "barbara_spence95", "onesines",
+            "coragios","suiedar","onesines","mmodatc","sjunqli","sytbing","entinaioc","senabchuan","talenmit","dudios",
+            "elecajxin","foneneo","gulilaev","vackeo","bnetufay","pjonusta","Elesporm","shaelefy","behcvtg","Jiangblwin",
+            "sytradenal","tmeiligda","gfruitan","Voasaon","Athltvc","nweifnmj","skillkedio","qmavitrd","covrivers",
+            "fruicang","touitdare","sweypvep","mudrwman","vuhnoghe","chsh-b","chsh-c","belar-dnb"};
 
     @Resource
     private EbayTransactionApi ebayTransactionApi;
@@ -53,13 +58,13 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
     @Override
     public void SyncEbayTransaction() {
         //获取未跑或失败的任务
-        List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(
+        /*List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(
                 new LambdaQueryWrapper<EbayAccountReportTask>()
                         .ne(EbayAccountReportTask::getStatus, 1)
-        );
-        /*List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(new LambdaQueryWrapper<EbayAccountReportTask>()
-                .ge(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 5, 4, 0, 0, 0))
-                .lt(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 5, 27, 0, 0, 0)));*/
+        );*/
+        List<EbayAccountReportTask> ebayAccountReportTaskList = ebayAccountReportTaskService.list(new LambdaQueryWrapper<EbayAccountReportTask>()
+                .ge(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 6, 28, 0, 0, 0))
+                .lt(EbayAccountReportTask::getStartTime, LocalDateTime.of(2021, 7, 8, 0, 0, 0)));
         //获取账号信息
         List<Integer> accountIdList = ebayAccountReportTaskList.stream().map(x -> x.getAccountId()).distinct().collect(Collectors.toList());
         List<DcBaseCompanyAccount> accountList = dcBaseCompanyAccountService.list(

datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/interfaces/BalanceSheetController.java

+package com.bailuntec.interfaces;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bailuntec.api.bailuntec.purchase.resp.LogisticsSupplierTransactionDTO;
+import com.bailuntec.api.bailuntec.purchase.resp.SupplierTransactionDTO;
+import com.bailuntec.job.service.BalanceSheetService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@RestController
+public class BalanceSheetController {
+    @Autowired
+    private BalanceSheetService balanceSheetService;
+
+    private  static Logger logger = LoggerFactory.getLogger(BalanceSheetController.class);
+
+    @GetMapping("/generate")
+    public String doScheduledTask(){
+        try{
+            balanceSheetService.generateBalanceSheet();
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error(">>>>>生成资产负债表出错" + e.getMessage());
+            return "生成资产负债表出错";
+        }
+        return "生成资产负债表成功";
+    }
+
+    @GetMapping("/test")
+    public String test(){
+        return "OK";
+    }
+
+    /**
+     * 更新调整后的供应商往来数据：应付账款和预付账款
+     * @return
+     */
+    @PostMapping("/adjustSupplierTransaction")
+    public String adjustSupplierTransaction(@RequestBody String updateData){
+        JSONObject result = new JSONObject();
+        try{
+            List<SupplierTransactionDTO> supplierTransactionDTOList = JSONObject.parseArray(updateData, SupplierTransactionDTO.class);
+            if(supplierTransactionDTOList != null && supplierTransactionDTOList.size() > 0){
+                balanceSheetService.adjustSupplierTransaction(supplierTransactionDTOList);
+            }
+            result.put("success", true);
+            result.put("message", "success");
+        } catch (Exception e){
+            e.printStackTrace();
+            logger.error(">>>>>更新调整后的供应商往来数据失败" + e.getMessage());
+            result.put("success", false);
+            result.put("message", "更新调整后的供应商往来数据失败" + e.getMessage());
+        }
+        return result.toString();
+    }
+
+    /**
+     * 更新调整后的物流供应商往来数据：应付账款和预付账款
+     * @return
+     */
+    @PostMapping("/adjustLogisticsSupplierTransaction")
+    public String adjustLogisticsSupplierTransaction(@RequestBody String updateData){
+        JSONObject result = new JSONObject();
+        try{
+            List<LogisticsSupplierTransactionDTO> logisticsSupplierTransactionDTOList = JSONObject.parseArray(updateData, LogisticsSupplierTransactionDTO.class);
+            if(logisticsSupplierTransactionDTOList != null && logisticsSupplierTransactionDTOList.size() > 0){
+                balanceSheetService.adjustLogisticsSupplierTransaction(logisticsSupplierTransactionDTOList);
+            }
+            result.put("success", true);
+            result.put("message", "success");
+        } catch (Exception e){
+            e.printStackTrace();
+            logger.error(">>>>>更新调整后的物流供应商往来数据失败" + e.getMessage());
+            result.put("success", false);
+            result.put("message", "更新调整后的物流供应商往来数据失败" + e.getMessage());
+        }
+        return result.toString();
+    }
+
+    @GetMapping("/updateSheetLogisticsSupplier")
+    public String updateSheetLogisticsSupplier(@RequestParam(value = "date", required = true) String date, BigDecimal logisticsPayableSum, BigDecimal accountsReceivableUpdate, BigDecimal accountsReceivableImport, BigDecimal otherAccountsReceivableImport, BigDecimal otherAccountsPayableImport, BigDecimal fixedAssetsImport, BigDecimal ncaDeferredTaxAssetsImport, BigDecimal platformBalanceUpdate) {
+        JSONObject result = new JSONObject();
+        try{
+            balanceSheetService.updateSheetSuppliserTransaction(date, logisticsPayableSum, accountsReceivableUpdate, accountsReceivableImport, otherAccountsReceivableImport, otherAccountsPayableImport, fixedAssetsImport, ncaDeferredTaxAssetsImport, platformBalanceUpdate);
+            result.put("success", true);
+            result.put("message", "success");
+        } catch (Exception e){
+            e.printStackTrace();
+            logger.error(">>>>>更新调整后的物流供应商往来数据失败" + e.getMessage());
+            result.put("success", false);
+            result.put("message", "更新调整后的物流供应商往来数据失败" + e.getMessage());
+        }
+        return result.toString();
+    }
+
+}

datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/BalanceSheetJob.java

@@ -19,11 +19,11 @@ public class BalanceSheetJob {
     @Scheduled(cron = "0 0 1 * * ?")
     public void syncBankAccount() {
         try {
-            log.info("每分钟同步 银行帐号信息 开始");
+            log.info("每天1点同步 银行帐号信息 开始");
             balanceSheetService.syncBankAccount();
-            log.info("每分钟同步 银行帐号信息 结束");
+            log.info("每天1点同步 银行帐号信息 结束");
         } catch (Exception ex) {
-            log.error("每分钟同步 银行帐号信息 异常:", ex);
+            log.error("每天1点同步 银行帐号信息 异常:", ex);
         }
     }
 
@@ -33,11 +33,11 @@ public class BalanceSheetJob {
     @Scheduled(cron = "0 0 1 * * ?")
     public void syncWithdrawOnWaySummary() {
         try {
-            log.info("每分钟 同步提现在途 开始");
+            log.info("每天1点 同步提现在途 开始");
             balanceSheetService.syncWithdrawOnWaySummary();
-            log.info("每分钟 同步提现在途 结束");
+            log.info("每天1点 同步提现在途 结束");
         } catch (Exception ex) {
-            log.error("每分钟 同步提现在途 异常:", ex);
+            log.error("每天1点 同步提现在途 异常:", ex);
         }
     }
 
@@ -47,11 +47,11 @@ public class BalanceSheetJob {
     @Scheduled(cron = "0 0 1 * * ?")
     public void syncPayPal() {
         try {
-            log.info("每分钟 同步第三方余额 开始");
+            log.info("每天1点 同步第三方余额 开始");
             balanceSheetService.syncPayPal();
-            log.info("每分钟 同步第三方余额 结束");
+            log.info("每天1点 同步第三方余额 结束");
         } catch (Exception ex) {
-            log.error("每分钟 同步第三方余额 异常:", ex);
+            log.error("每天1点 同步第三方余额 异常:", ex);
         }
     }
 
@@ -63,25 +63,25 @@ public class BalanceSheetJob {
     @Transactional(rollbackFor = Exception.class)
     public void syncShortBorrowBalance() {
         try {
-            log.info("每分钟 同步提现在途 开始");
+            log.info("每天1点 同步提现在途 开始");
             balanceSheetService.syncShortBorrowBalance();
-            log.info("每分钟 同步提现在途 结束");
+            log.info("每天1点 同步提现在途 结束");
         } catch (Exception ex) {
-            log.error("每分钟 同步提现在途 异常:", ex);
+            log.error("每天1点 同步提现在途 异常:", ex);
         }
     }
 
     /**
      * 同步数据中心需要的费用单
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    //@Scheduled(cron = "0 0 1 * * ?")
     public void syncCost() {
         try {
-            log.info("每分钟 同步数据中心需要的费用单 开始");
-            //balanceSheetService.syncCost();
-            log.info("每分钟 同步数据中心需要的费用单 结束");
+            log.info("每天1点 同步数据中心需要的费用单 开始");
+            balanceSheetService.syncCost();
+            log.info("每天1点 同步数据中心需要的费用单 结束");
         } catch (Exception ex) {
-            log.error("每分钟 同步数据中心需要的费用单 异常:", ex);
+            log.error("每天1点 同步数据中心需要的费用单 异常:", ex);
         }
     }
 
@@ -92,17 +92,17 @@ public class BalanceSheetJob {
     @Scheduled(cron = "0 0 1 * * ?")
     public void syncBuy() {
         try {
-            log.info("每分钟 同步费用系统采购单 开始");
+            log.info("每天1点 同步费用系统采购单 开始");
             balanceSheetService.syncBuy();
-            log.info("每分钟 同步费用系统采购单 结束");
+            log.info("每天1点 同步费用系统采购单 结束");
         } catch (Exception ex) {
-            log.error("每分钟 同步费用系统采购单 异常:", ex);
+            log.error("每天1点 同步费用系统采购单 异常:", ex);
         }
     }
 
     /**
      * <p>
-     *     每天生成半成品数据
+     * 每天生成半成品数据
      * </p>
      */
     @Scheduled(cron = "0 0 1 * * ?")
@@ -117,6 +117,20 @@ public class BalanceSheetJob {
     }
 
     /**
+     * 每周六日获取物流供应商往来数据
+     */
+    @Scheduled(cron = "0 0 2 ? 1-12 1,7 *")
+    public void syncLogisticsSupplierTransaction() {
+        try {
+            log.info("每周六日 获取物流供应商往来数据 开始");
+            balanceSheetService.getLogisticsSupplierTransaction();
+            log.info("每周六日 获取物流供应商往来数据 结束");
+        } catch (Exception ex) {
+            log.error("每周六日 获取物流供应商往来数据 异常:", ex);
+        }
+    }
+
+    /**
      * 每天 生成资产负债表
      * companyValue 0
      * companyName 百伦供应链
@@ -125,14 +139,14 @@ public class BalanceSheetJob {
      * </p>
      * 数据来源
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
     public void generateBalanceSheet() {
         try {
-            log.info("每分钟 生成资产负债表 开始");
+            log.info("每天1点 生成资产负债表 开始");
             balanceSheetService.generateBalanceSheet();
-            log.info("每分钟 生成资产负债表 结束");
+            log.info("每天1点 生成资产负债表 结束");
         } catch (Exception ex) {
-            log.error("每分钟 生成资产负债表 异常:", ex);
+            log.error("每天1点 生成资产负债表 异常:", ex);
         }
     }
 
@@ -145,14 +159,14 @@ public class BalanceSheetJob {
      * </p>
      * 数据来源
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 4 * * ?")
     public void generateBalanceSheetNewResult() {
         try {
-            log.info("每分钟 生成新资产负债结果表 开始");
+            log.info("每天1点 生成新资产负债结果表 开始");
             balanceSheetService.generateBalanceSheetNewResult();
-            log.info("每分钟 生成新资产负债结果表 结束");
+            log.info("每天1点 生成新资产负债结果表 结束");
         } catch (Exception ex) {
-            log.error("每分钟 生成新资产负债结果表 异常:", ex);
+            log.error("每天1点 生成新资产负债结果表 异常:", ex);
         }
     }
 

datacenter-job/datacenter-finance/finance-balance-sheet/src/test/java/com/bailuntec/job/service/BalanceSheetServiceTest.java

@@ -6,6 +6,7 @@ import com.bailuntec.infrastructure.mapper.DcJobConfigMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -60,6 +61,17 @@ public class BalanceSheetServiceTest {
     }
 
     @Test
+    public void syncPayPal() {
+        balanceSheetService.syncPayPal();
+    }
+
+    @Test
+    public void syncSemiInventoryBalance() {
+        balanceSheetService.syncSemiInventoryBalance();
+    }
+
+    @Test
+    @Rollback(value = false)
     public void generateBalanceSheet() {
         balanceSheetService.generateBalanceSheet();
     }

datacenter-task/ebay-report-consumer/src/main/java/com/bailuntec/task/reader/CustomerReader.java

@@ -52,7 +52,12 @@ public class CustomerReader implements ItemReader<EbayItem> {
     //当前页码
     private Integer pageNum;
     //无需跑任务的账号
-    private final static String[] CANNOT_RUN_ACCOUNT = new String[]{"ottlueilwitz3","jalenhe","uha4mmada","rownmelody5","nthonyp6ecket","rayallen9","barbara_spence95","nbrysonhall","credit4free"};
+    private final static String[] CANNOT_RUN_ACCOUNT = new String[]{"ottlueilwitz3","jalenhe","uha4mmada","rownmelody5",
+            "nthonyp6ecket","rayallen9","barbara_spence95","nbrysonhall","credit4free", "onesines","coragios","suiedar",
+            "onesines","mmodatc","sjunqli","sytbing","entinaioc","senabchuan","talenmit","dudios","elecajxin","foneneo",
+            "gulilaev","vackeo","bnetufay","pjonusta","Elesporm","shaelefy","behcvtg","Jiangblwin","sytradenal",
+            "tmeiligda","gfruitan","Voasaon","Athltvc","nweifnmj","skillkedio","qmavitrd","covrivers","fruicang",
+            "touitdare","sweypvep","mudrwman","vuhnoghe","chsh-b","chsh-c","belar-dnb"};
 
 
     @Resource