Merge remote-tracking branch 'origin/test' into test

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -116,6 +116,8 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损）",example = "1")
     private Integer settlementWay;
 
+    @ApiModelProperty(value="结算方式")
+    private String settlementWayMsg;
 
     @ApiModelProperty(value="开票公司id",example = "1")
     private Integer invoicingCompanyId;  //开票公司id

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerDetailController.java

@@ -83,7 +83,7 @@ public class CarrierSettlementOwnerDetailController {
 
     @ApiOperation(value = "上传批量开票文件",notes = "<br>By:杨启发")
     @PostMapping("/uploadBatchInvoiceFile")
-    public Result<UploadBatchInvoiceFileResultVO> uploadBatchInvoiceFile(@RequestPart("file") MultipartFile file) throws IOException {
+    public Result<UploadBatchInvoiceFileResultVO> uploadBatchInvoiceFile(@RequestParam("file") MultipartFile file) throws IOException {
         return Result.ok(settlementOwnerDetailService.uploadBatchInvoiceFile(file));
     }
 

performance-web/src/main/java/com/clx/performance/controller/temp/TempSettlementController.java

@@ -3,6 +3,7 @@ package com.clx.performance.controller.temp;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.listener.OrderChildSyncTransportListener;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.vo.mq.SettlementStatisticsMqParam;
@@ -33,6 +34,8 @@ public class TempSettlementController {
     private OrderChildSyncTransportListener orderChildSyncTransportListener;
     @Autowired
     private SettlementMqHandlerService settlementMqHandlerService;
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
 
     @ApiOperation(value = "settlementStatistics", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/settlementStatistics", method = RequestMethod.GET)
@@ -45,13 +48,29 @@ public class TempSettlementController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "结算单新增", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/settlementDetailAdd", method = RequestMethod.GET)
+    public Result settlementDetailAdd(Integer settlementOwnerDetailId, Integer settlementDriverDetailId) {
+
+        settlementMqService.settlementDetailAdd(settlementOwnerDetailId, settlementDriverDetailId);
+
+        return Result.ok();
+    }
     @ApiOperation(value = "运单同步broker", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
     public Result orderChildSync(String childNo) {
-        OrderChild orderChild = orderChildDao.getByChildNo(childNo).get();
 
-        // 同步broker
-        orderChildSyncTransportListener.transportOrderChildProcess(orderChild);
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildSync(childNo);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "运单更新broker", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/orderChildUpdate", method = RequestMethod.GET)
+    public Result orderChildUpdate(String childNo) {
+
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(childNo);
 
         return Result.ok();
     }

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

@@ -28,10 +28,10 @@ public class BrokerServiceImpl implements BrokerService {
         Result<Object> result = brokerFeign.saveTransport(param);
         log.info("运单同步网络货运, param:{}", JSON.toJSONString(param));
         if (result.getCode() != 0) {
-            log.info("运单同步网络货运失败, msg:{}", result.getMsg());
+            log.info("运单同步网络货运失败, childNo:{}, msg:{}", param.getOrderChild().getSourceChildNo(), result.getMsg());
             throw new ServiceSystemException(ResultEnum.FEIGN_ERROR, result.getMsg());
         }
-        log.info("运单同步网络货运, result:{}", JSON.toJSONString(result));
+        log.info("运单同步网络货运, childNo:{}, result:{}", param.getOrderChild().getSourceChildNo(), JSON.toJSONString(result));
     }
 
     @Override
@@ -40,10 +40,10 @@ public class BrokerServiceImpl implements BrokerService {
 
         Result<Object> result = brokerFeign.modifyTransport(param);
         if (result.getCode() != 0) {
-            log.info("运单更新网络货运失败, msg:{}", result.getMsg());
+            log.info("运单更新网络货运失败, childNo:{}, msg:{}", param.getOrderChild().getSourceChildNo(), result.getMsg());
             throw new ServiceSystemException(ResultEnum.FEIGN_ERROR, result.getMsg());
         }
-        log.info("运单更新网络货运, result:{}", JSON.toJSONString(result));
+        log.info("运单更新网络货运, childNo:{}, result:{}", param.getOrderChild().getSourceChildNo(), JSON.toJSONString(result));
     }
 
     @Override
@@ -57,9 +57,9 @@ public class BrokerServiceImpl implements BrokerService {
 
         Result<TransportVO> result = brokerFeign.getTransportByChildNo(childNo, settlementConfig.getBrokerUserCode(), settlementNo);
         if (result.getCode() != 0) {
-            log.info("运单同步网络货运失败, msg:{}", result.getMsg());
+            log.info("获取网络货运运单状态, childNo:{}, msg:{}", childNo, result.getMsg());
         }
-        log.info("运单同步网络货运, result:{}", JSON.toJSONString(result));
+        log.info("获取网络货运运单状态, childNo:{}, result:{}", childNo, JSON.toJSONString(result));
 
         return result.getData();
     }

performance-web/src/main/java/com/clx/performance/listener/broker/BrokerDelayListener.java

@@ -28,7 +28,7 @@ public class BrokerDelayListener {
     @RabbitListener(queues = RabbitKeyBrokerConstants.DEFAULT_DEAD_QUEUE)
     public void process(Message message) {
         try{
-            log.info("无车承运-延迟, message:{}", message);
+            log.info("无车承运-延迟, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<MqDelay>>(){}).getData());
         }catch (Exception e){
             log.info("无车承运-延迟 失败",e);

performance-web/src/main/java/com/clx/performance/listener/settle/SettlementDelayListener.java

@@ -28,7 +28,7 @@ public class SettlementDelayListener {
     @RabbitListener(queues = RabbitKeySettlementConstants.DEFAULT_DEAD_QUEUE)
     public void process(Message message) {
         try{
-            log.info("结算-延迟, message:{}", message);
+            log.info("结算-延迟, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<MqDelay>>(){}).getData());
         }catch (Exception e){
             log.info("结算-延迟 失败",e);

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -1296,7 +1296,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     @Override
     public SXSSFWorkbook exportPrepaidFreightList(PageOwnerAccountListParam param) {
-
+        param.setPage(1);
+        param.setPageSize(1000000);
         IPage<OwnerAccountVO> page = ownerAccountDao.pageList(param);
         List<OwnerAccountVO> list = page.getRecords();
 
@@ -1306,7 +1307,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         fieldList.add(new ExcelField(1, "货主名称", "ownerUserNo", 5000));
         fieldList.add(new ExcelField(2, "联系电话", "ownerName", 5000));
         fieldList.add(new ExcelField(3, "账户类型", "mobile", 5000));
-        fieldList.add(new ExcelField(4, "账户余额", "accountType", 15000));
+        fieldList.add(new ExcelField(4, "账户余额", "accountType", 5000));
         fieldList.add(new ExcelField(5, "可用余额", "runningWaterType", 5000));
         fieldList.add(new ExcelField(6, "冻结余额", "orderNo", 5000));
         fieldList.add(new ExcelField(7, "创建人", "alterationBalance", 5000));

performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqServiceImpl.java

@@ -43,7 +43,7 @@ public class OrderChildBrokerMqServiceImpl implements OrderChildBrokerMqService
 
         MqDelay delay =
                 new MqDelay<>(RabbitKeyBrokerConstants.DEFAULT_EXCHANGE,
-                        RabbitKeyBrokerConstants.ORDER_CHILD_SYNC_ROUTING_KEY, new MqWrapper<>(mq));
+                        RabbitKeyBrokerConstants.ORDER_CHILD_UPDATE_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
         rabbitTemplate.send(RabbitKeyBrokerConstants.DEFAULT_EXCHANGE,

performance-web/src/main/java/com/clx/performance/service/impl/child/OrderChildPostServiceImpl.java

@@ -197,6 +197,7 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
 
+        log.info("磅单审核 childNo:{} 磅单审核 status:{}, {}", orderChild.getChildNo(), poundAuditDetail.getStatus(), Objects.equals(poundAuditDetail.getStatus(), OrderChildPoundAuditEnum.Status.APPROVED.getCode()));
         if (Objects.equals(poundAuditDetail.getStatus(), OrderChildPoundAuditEnum.Status.APPROVED.getCode())) {
             // 生成计费单
             SettlementDriverDetail settlementDriverDetail = settlementDriverDetailService.saveSettlementDetail(orderChild);

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -496,11 +496,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
             settlementOwnerDetailDao.updatePreFreight(settlementOwnerDetail);
             settlementDriverDetailDao.updatePreFreight(settlementDriverDetail);
-
-            // 发送mq (更新无车承运)
-            orderChildBrokerMqService.orderChildSync(orderChild.getChildNo());
-
-        } else {
+        }
 
         if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
             // 转普通单
@@ -522,7 +518,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             // 发送mq (更新无车承运)
             orderChildBrokerMqService.orderChildSync(orderChild.getChildNo());
         }
-        }
 
 //
 //        log.info("更新网络标识 {} ",orderChild.getChildNo());

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -92,8 +92,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
     @Autowired
     private FileUploadFeign fileUploadFeign;
 
-
-
     @Override
     public Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods, SettlementDriverDetail settlementDriverDetail) {
 
@@ -252,8 +250,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         IPage<SettlementOwnerDetail> page = settlementOwnerDetailDao.pageInvoiceOwnerSettlementOrderDetailList(param);
         CountOwnerSettlementOwnerDetailVO vo = new CountOwnerSettlementOwnerDetailVO();
         vo.setOrderChildSum(page.getTotal());
-        vo.setLoadNetSum(page.getRecords().stream().map(SettlementOwnerDetail::getLoadNet).reduce(BigDecimal.ZERO,BigDecimal::add));
-        vo.setInvoiceFreightSum(page.getRecords().stream().map(SettlementOwnerDetail::getInvoiceFreight).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setLoadNetSum(page.getRecords().stream().map(SettlementOwnerDetail::getLoadNet).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setInvoiceFreightSum(page.getRecords().stream().map(SettlementOwnerDetail::getInvoiceFreight).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
         return vo;
     }
 
@@ -602,7 +600,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
         fieldList.add(new ExcelField(1, "货主名称", "ownerName", 5000));
-        fieldList.add(new ExcelField(2, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(2, "结算方式", "settlementWayMsg", 5000));
         fieldList.add(new ExcelField(3, "开票公司", "invoicingCompanyShorterName", 5000));
         fieldList.add(new ExcelField(4, "开票标识", "invoiceTypeMsg", 5000));
         fieldList.add(new ExcelField(5, "货物名称", "goodsName", 5000));
@@ -641,7 +639,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
             rowData.add(new ExcelData(vo.getChildNo()));
             rowData.add(new ExcelData(vo.getOwnerName()));
-            rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(vo.getSettlementWay())));
+            rowData.add(new ExcelData(vo.getSettlementWayMsg()));
             rowData.add(new ExcelData(vo.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(vo.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(vo.getGoodsName()));
@@ -706,7 +704,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         vo.setVerifyResult(verifyResult);
         vo.setErrorFileUrl(uploadResult==null?null:uploadResult.getData());
         vo.setOrderChildSum(invoiceDataList.size());
-        vo.setLoadWeightSum(invoiceDataList.stream().map(InvoiceData::getLoadNet).reduce(BigDecimal.ZERO,BigDecimal::add));
+        vo.setLoadWeightSum(invoiceDataList.stream().map(InvoiceData::getLoadNet).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
         vo.setInvoiceFreightSum(invoiceDataList.stream().map(InvoiceData::getInvoiceFreight).reduce(BigDecimal.ZERO,BigDecimal::add));
         vo.setChildNoList(invoiceDataList.stream().map(InvoiceData::getChildNo).collect(Collectors.toList()));
         return vo;

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementOwnerDetailStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct.settle;
 
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPagePendingSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
@@ -15,7 +16,7 @@ import org.mapstruct.Named;
 
 import java.util.List;
 
-@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {SettlementOwnerDetailEnum.class, SettlementOwnerEnum.class,DateUtils.class})
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {SettlementOwnerDetailEnum.class, SettlementOwnerEnum.class, SettlementWayEnum.class,DateUtils.class})
 public interface SettlementOwnerDetailStruct {
 
 
@@ -27,6 +28,7 @@ public interface SettlementOwnerDetailStruct {
     @Mapping(target = "invoiceTypeMsg", expression = "java(SettlementOwnerEnum.InvoiceType.getMsgByCode(settlementOwner.getInvoiceType()))")
     @Mapping(target = "finalPaymentStatusMsg", expression = "java(SettlementOwnerDetailEnum.FinalPaymentStatus.getMsgByCode(settlementOwner.getFinalPaymentStatus()))")
     @Mapping(target = "invoiceStatusMsg", expression = "java(SettlementOwnerDetailEnum.InvoiceStatus.getMsgByCode(settlementOwner.getInvoiceStatus()))")
+    @Mapping(target = "settlementWayMsg", expression = "java(SettlementWayEnum.WayType.getMsgByCode(settlementOwner.getSettlementWay()))")
     PageOwnerSettlementOwnerDetailVO convert(SettlementOwnerDetail settlementOwner);
 
     @IterableMapping(qualifiedByName = "toBaseVo")

performance-web/src/test/java/com/clx/performance/OwnerAccountServiceImplTest.java

+package com.clx.performance;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
+import com.clx.performance.dao.OwnerAccountDao;
+import com.clx.performance.param.pc.PageOwnerAccountListParam;
+import com.clx.performance.service.impl.OwnerAccountServiceImpl;
+import com.clx.performance.vo.pc.OwnerAccountVO;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class OwnerAccountServiceImplTest {
+
+    @Mock
+    private OwnerAccountDao ownerAccountDao;
+
+    @InjectMocks
+    private OwnerAccountServiceImpl ownerAccountService;
+
+    private PageOwnerAccountListParam param;
+
+    @Before
+    public void setUp() {
+        param = new PageOwnerAccountListParam();
+        // Assuming there's a default page size set in PageOwnerAccountListParam
+        param.setPageSize(10);
+        param.setPage(1);
+    }
+
+    @Test
+    public void testExportPrepaidFreightList() throws IOException {
+        List<OwnerAccountVO> records = new ArrayList<>();
+        OwnerAccountVO accountVO = new OwnerAccountVO();
+        accountVO.setId(18);
+        accountVO.setOwnerUserNo("188888");
+        accountVO.setOwnerUserName("owner88");
+        accountVO.setMobile("18888888888");
+        accountVO.setAccountType(1);
+        accountVO.setAccountBalance(new BigDecimal("8888.88"));
+        accountVO.setUsableBalance(new BigDecimal("8888.88"));
+        accountVO.setFrozenBalance(new BigDecimal("8888.88"));
+        accountVO.setCreateBy("domino.j");
+        accountVO.setCreateTime("2024-08-07 14:15:18");
+        accountVO.setModifiedTime("2024-08-07 14:15:18");
+        records.add(accountVO);
+
+        PageDTO page = new PageDTO(1, 10000);
+        page.setRecords(records);
+
+        // Mock the behavior of the ownerAccountDao
+        when(ownerAccountDao.pageList(param)).thenReturn(page);
+
+        // Perform the test
+        SXSSFWorkbook workbook = ownerAccountService.exportPrepaidFreightList(param);
+
+        workbook.write(new java.io.FileOutputStream("ccc.xlsx"));
+    }
+
+}
\ No newline at end of file