应收账款计算条件新增shopify

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcSupplierTransactionMapper.java

@@ -49,7 +49,7 @@ public interface DcSupplierTransactionMapper {
     @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") Date lastDay);
 
-    @Select("select sum(case when platform != 'Ebay' then amount_end else 0 end) - sum(case when platform = 'Ebay' then amount_end else 0 end) from dc_daily_receivable where day = #{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") Date lastDay);
 
     /**

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

@@ -7,6 +7,7 @@ import com.bailuntec.domain.dto.DcBaseFinanceEbayItemDto;
 import com.bailuntec.domain.entity.*;
 import com.bailuntec.domain.example.DcBaseFinanceEbayExample;
 import com.bailuntec.domain.example.DcBaseFinanceEbayItemExample;
+import com.bailuntec.mapper.DcBaseEbaySkuMappingMapper;
 import com.bailuntec.mapper.DcBaseFinanceEbayItemMapper;
 import com.bailuntec.mapper.DcBaseFinanceEbayMapper;
 import com.bailuntec.support.PointJob;
@@ -82,6 +83,7 @@ public class CalculateEbayItemJob extends PointJob {
                             dcBaseFinanceEbayItem.setCurrency(dcBaseFinanceEbayItemDto.getCurrency());
                             dcBaseFinanceEbayItem.setExchangeRate(dcBaseFinanceEbayItemDto.getExchangeRate());
                             dcBaseFinanceEbayItem.setExchangeRateUsd(dcBaseFinanceEbayItemDto.getExchangeRateUsd());
+                            dcBaseFinanceEbayItem.setId(null);
                             dcBaseFinanceEbayItem.setSkuCount(1);
                             if(dcBaseFinanceEbayItem.getBailunSku() == null) {
                                 dcBaseFinanceEbayItem.setBailunSku("无");
@@ -148,6 +150,9 @@ public class CalculateEbayItemJob extends PointJob {
                                         }
                                         DcBaseFinanceEbayItemMapper dcBaseFinanceEbayItemMapper = SessionUtil.getSession().getMapper(DcBaseFinanceEbayItemMapper.class);
                                         dcBaseFinanceEbayItemMapper.insertSelective(dcBaseFinanceEbayItem);
+
+                                        DcBaseEbaySkuMappingMapper dcBaseEbaySkuMappingMapper = SessionUtil.getSession().getMapper(DcBaseEbaySkuMappingMapper.class);
+                                        dcBaseEbaySkuMappingMapper.upsertSelective(ebaySkuMapping);
                                     }
                                 }else {
                                     DcBaseFinanceEbayItem dcBaseFinanceEbayItem = new DcBaseFinanceEbayItem();