数据中心--资产负债表物流供应商应付款计算修改

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/controller/BalanceSheetController.java

@@ -7,12 +7,12 @@ import com.bailuntec.balancesheet.service.BalanceSheetService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class BalanceSheetController {
@@ -84,4 +84,20 @@ public class BalanceSheetController {
         return result.toString();
     }
 
+    @GetMapping("/updateSheetLogisticsSupplier")
+    public String updateSheetLogisticsSupplier(@RequestParam(value = "date", required = true) String date, @RequestParam(value = "logisticsPayableSum", required = true) BigDecimal logisticsPayableSum) {
+        JSONObject result = new JSONObject();
+        try{
+            balanceSheetService.updateSheetSuppliserTransaction(date, logisticsPayableSum);
+            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();
+    }
+
 }

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

@@ -137,6 +137,9 @@ public interface DcBalanceSheetMapper {
     @ResultMap("com.bailuntec.balancesheet.mapper.DcBalanceSheetMapper.BaseResultMap")
     DcBalanceSheet selectByPrimaryKey(Integer id);
 
+    @Select({"select finished_accounts_payable from dc_balance_sheet where statistical_time = #{date}"})
+    BigDecimal getLogisticsAccountsPayableSum(@Param("date") Date date);
+
     int updateByPrimaryKeySelective(DcBalanceSheet record);
 
     @Update({

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/service/BalanceSheetService.java

@@ -16,6 +16,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
@@ -569,7 +571,7 @@ public class BalanceSheetService {
         if(semiAccountsPayableSum == null) semiAccountsPayableSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiAccountsPayable(semiAccountsPayableSum);
         // 物流供应商应付款项
-        BigDecimal logisticsAccountsPayableSum = dcLogisticsSupplierTransactionMapper.getLogisticsAccountsPayableSum(date);
+        BigDecimal logisticsAccountsPayableSum = dcBalanceSheetMapper.getLogisticsAccountsPayableSum(date);
         if(logisticsAccountsPayableSum == null) logisticsAccountsPayableSum = BigDecimal.ZERO;
         dcBalanceSheet.setLogisticsAccountsPayable(logisticsAccountsPayableSum);
         // 应付款项
@@ -599,6 +601,31 @@ public class BalanceSheetService {
         dcBalanceSheetMapper.updateByCompanyAndDaySelective(dcBalanceSheet);
     }
 
+    public void updateSheetSuppliserTransaction(String dateStr, BigDecimal logisticsPayableSum) throws ParseException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = simpleDateFormat.parse(dateStr);
+        DcBalanceSheet dcBalanceSheet = new DcBalanceSheet();//物流供应商、成品供应商、半成品供应商
+        // 成品供应商应付款项
+        BigDecimal finishedAccountsPayableSum = dcSupplierTransactionMapper.getFinishedAccountsPayableSum(date);
+        if(finishedAccountsPayableSum == null) finishedAccountsPayableSum = BigDecimal.ZERO;
+        dcBalanceSheet.setFinishedAccountsPayable(finishedAccountsPayableSum);
+        // 半成品供应商应付款项
+        BigDecimal semiAccountsPayableSum = dcSupplierTransactionMapper.getSemiAccountsPayableSum(date);
+        if(semiAccountsPayableSum == null) semiAccountsPayableSum = BigDecimal.ZERO;
+        dcBalanceSheet.setSemiAccountsPayable(semiAccountsPayableSum);
+        // 物流供应商应付款项
+        BigDecimal logisticsAccountsPayableSum = logisticsPayableSum;
+        if(logisticsAccountsPayableSum == null) logisticsAccountsPayableSum = BigDecimal.ZERO;
+        dcBalanceSheet.setLogisticsAccountsPayable(logisticsAccountsPayableSum);
+        // 应付款项
+        BigDecimal accountsPayableSum = finishedAccountsPayableSum.add(semiAccountsPayableSum).add(logisticsAccountsPayableSum);
+        dcBalanceSheet.setAccountsPayable(accountsPayableSum);
+
+        dcBalanceSheet.setCompanyValue(0);
+        dcBalanceSheet.setStatisticalTime(date);
+        dcBalanceSheetMapper.updateByCompanyAndDaySelective(dcBalanceSheet);
+    }
+
     /**
      * 获取其他应付款和其他应收款
      * @param date