springboot2+avue
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
sen
2 天以前 7ed2a032d0724e68aec8af940f2ce0023a9f0eb7 
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsReceivableFeeServiceImpl.java


@@ -1,15 +1,34 @@


package com.ruoyi.tms.service.impl;




import java.io.File;


import java.io.FileOutputStream;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.HashMap;


import java.util.HashSet;


import java.util.List;


import java.util.Map;


import java.util.Set;


import java.util.stream.Collectors;




import com.alibaba.fastjson2.JSONObject;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.ruoyi.common.core.domain.AjaxResult;


import com.ruoyi.common.core.redis.RedisCache;


import com.ruoyi.common.enums.SystemDataNoEnum;


import com.ruoyi.common.exception.ServiceException;


import com.ruoyi.common.utils.DateUtils;




import com.ruoyi.common.utils.file.DownloadExportUtil;


import com.ruoyi.common.utils.poi.ExcelUtil;


import com.ruoyi.common.config.RuoYiConfig;


import org.apache.poi.ss.usermodel.*;


import org.apache.poi.ss.util.CellRangeAddress;


import org.apache.poi.xssf.streaming.SXSSFSheet;


import org.apache.poi.xssf.streaming.SXSSFWorkbook;


import org.apache.poi.xssf.usermodel.XSSFColor;


import javax.annotation.Resource;




import com.ruoyi.common.utils.SecurityUtils;


@@ -27,6 +46,8 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.scheduling.annotation.Async;


import org.springframework.core.task.AsyncTaskExecutor;


import org.springframework.core.task.SimpleAsyncTaskExecutor;


import org.springframework.web.client.RestTemplate;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


@@ -71,7 +92,8 @@


    @Value("${custom.cwxtApi.url}")


    private String url;






    @Autowired


    private RedisCache redisCache;


    /**


     * 查询应收费用


     *


@@ -151,6 +173,16 @@


            return selectTmsReceivableFeeList(tmsReceivableFee);


        });


    }


























    /**


@@ -271,7 +303,10 @@




        tmsArBill.setSettleAmount(BigDecimal.ZERO);


        tmsReceivableFees.forEach(item ->{




            List<TmsReceivableFeeItem> tmsReceivableFeeItems = tmsReceivableFeeItemMapper.selectTmsReceivableFeeItemList(new TmsReceivableFeeItem() {{


                setHeadId(item.getId());


            }});


            item.setItems(tmsReceivableFeeItems);


            BigDecimal rmbAmount = item.getReceivableHKBAmount()


                    .multiply(exchangeRate)


                    .setScale(2, RoundingMode.HALF_UP);


@@ -296,6 +331,7 @@


        tmsArBill.setSettledAmount(BigDecimal.ZERO);


        tmsArBill.setInvoiceStatus(0);


        tmsArBill.setStatus(0);


        tmsArBill.setPushStatus(0); // 初始推送状态：未推送


        tmsArBill.setCreateBy(SecurityUtils.getUsername());


        tmsArBillMapper.insertTmsArBill(tmsArBill);




@@ -323,8 +359,9 @@


        }).collect(Collectors.toList());


        tmsArBillItemMapper.insertTmsArBillItemBatch(rmb);




        //todo 向外部系统推送数据


//        pushToExternalSystem(tmsArBill, tmsReceivableFees);


        // 向外部系统推送数据


        AsyncTaskExecutor executor = new SimpleAsyncTaskExecutor();


        executor.execute(() -> pushToExternalSystem(tmsArBill, tmsReceivableFees));


        


        return AjaxResult.success();


    }


@@ -371,7 +408,7 @@


            billMap.put("billDueDate", "");


            billMap.put("settlementCategory", "");


            billMap.put("settlementPeriod", "");


            billMap.put("status", "draft");


            billMap.put("status", "0");


            billMap.put("remark", "");


            


            // 构建fees部分


@@ -382,8 +419,8 @@


                feeMap.put("serialNumber", String.format("%03d", i + 1));


                feeMap.put("relatedBillNo", "");


                feeMap.put("sourceSystem", "TMS");


                feeMap.put("businessSector", "");


                feeMap.put("documentType", "");


                feeMap.put("businessSector", "0");


                feeMap.put("documentType", "0");


                feeMap.put("documentNo", fee.getDispatchNo() != null ? fee.getDispatchNo() : "");


                feeMap.put("isInternalSettlement", "0");


                feeMap.put("internalSettlementUnit", "");


@@ -391,26 +428,45 @@


                feeMap.put("projectName", fee.getProjectName() != null ? fee.getProjectName() : "");


                feeMap.put("businessTime", fee.getDispatchConfirmTime());


                feeMap.put("receivableConfirmTime", fee.getDispatchConfirmTime());


                feeMap.put("receivableAmount", fee.getReceivableRmbSumAmount());


                feeMap.put("status", "confirmed");


                feeMap.put("receivableAmount", fee.getReceivableRMBAmount().add(fee.getReceivableHKBAmount()));


                // 构建receivableAmountStr


                BigDecimal rmbAmount = fee.getReceivableRMBAmount();


                BigDecimal hkbAmount = fee.getReceivableHKBAmount();


                StringBuilder amountStr = new StringBuilder();


                if (rmbAmount.compareTo(BigDecimal.ZERO) > 0) {


                    amountStr.append(rmbAmount).append("人民币");


                }


                if (hkbAmount.compareTo(BigDecimal.ZERO) > 0) {


                    if (amountStr.length() > 0) {


                        amountStr.append(" ");


                    }


                    amountStr.append(hkbAmount).append("港币");


                }


                feeMap.put("receivableAmountStr", amountStr.toString());


                feeMap.put("status", "1");


                feeMap.put("remark", "");


                


                // 构建feeDetails部分


                List<java.util.Map<String, Object>> feeDetailsList = new java.util.ArrayList<>();


                java.util.Map<String, Object> feeDetailMap = new java.util.HashMap<>();


                feeDetailMap.put("serialNumber", String.format("%03d-01", i + 1));


                feeDetailMap.put("feeType", "");


                feeDetailMap.put("feeName", "");


                feeDetailMap.put("billingUnit", "");


                feeDetailMap.put("unitPrice", 0.00);


                feeDetailMap.put("billingQuantity", 0.00);


                feeDetailMap.put("billingAmount", fee.getReceivableRmbSumAmount());


                feeDetailMap.put("actualAmount", fee.getReceivableRmbSumAmount());


                feeDetailMap.put("currency", "RMB");


                feeDetailMap.put("feeRegTime", "");


                feeDetailMap.put("remark", "");


                feeDetailsList.add(feeDetailMap);


                


                List<TmsReceivableFeeItem> items = fee.getItems();


                for (int j = 0; j < items.size(); j++) {


                    TmsReceivableFeeItem item = items.get(j);


                    java.util.Map<String, Object> feeDetailMap = new java.util.HashMap<>();


                    feeDetailMap.put("serialNumber", String.format("%03d", j + 1));


                    feeDetailMap.put("feeType", item.getFeeType());


                    feeDetailMap.put("feeName", item.getFeeName());


                    feeDetailMap.put("billingUnit", "次");


                    feeDetailMap.put("unitPrice", item.getRegisterAmount());


                    feeDetailMap.put("billingQuantity", item.getRegisterAmount());


                    feeDetailMap.put("billingAmount", item.getRegisterAmount());


                    feeDetailMap.put("actualAmount", item.getRegisterAmount());


                    feeDetailMap.put("currency", item.getCurrency());


                    feeDetailMap.put("feeRegTime", item.getRegisterTime());


                    feeDetailMap.put("remark", "");


                    feeDetailsList.add(feeDetailMap);


                }






                feeMap.put("feeDetails", feeDetailsList);


                feesList.add(feeMap);


            }


@@ -427,11 +483,32 @@


            // 发送API请求


            ResponseEntity<String> response = restTemplate.exchange(apiUrl, HttpMethod.POST, entity, String.class);


            logger.info("推送数据到外部系统成功，响应: {}", response.getBody());


            


            // 解析响应，获取sourceSystemId


            try {


                JSONObject result = JSONObject.parseObject(response.getBody());


                String sourceSystemId = result.getString("sourceSystemId");


                if (sourceSystemId != null) {


                    tmsArBill.setSourceSystemId(Integer.parseInt(sourceSystemId));


                }


            } catch (Exception e) {


                logger.error("解析外部系统响应失败: {}", e.getMessage());


            }




            


            // 更新推送状态为成功


            tmsArBill.setPushStatus(2);


            tmsArBill.setPushTime(DateUtils.getNowDate());


            tmsArBillMapper.updateTmsArBill(tmsArBill);


        } catch (Exception e) {


            logger.error("推送数据到外部系统失败，账单ID: {}, 客户: {}", 


                tmsArBill.getId(), tmsArBill.getCustomerName(), e);


            logger.debug("推送失败的请求数据: {}", JSON.toJSONString(requestBody));


            // 推送失败不影响主流程，记录日志即可


            


            // 更新推送状态为失败


            tmsArBill.setPushStatus(3);


            tmsArBill.setPushTime(DateUtils.getNowDate());


            tmsArBillMapper.updateTmsArBill(tmsArBill);


        }


    }