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

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

@@ -6,6 +6,7 @@ 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.SettlementDetailAddMqParam;
 import com.clx.performance.vo.mq.SettlementStatisticsMqParam;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
@@ -52,7 +53,12 @@ public class TempSettlementController {
     @RequestMapping(value = "/settlementDetailAdd", method = RequestMethod.GET)
     public Result settlementDetailAdd(Integer settlementOwnerDetailId, Integer settlementDriverDetailId) {
 
-        settlementMqService.settlementDetailAdd(settlementOwnerDetailId, settlementDriverDetailId);
+//        SettlementDetailAddMqParam mq = new SettlementDetailAddMqParam();
+//        mq.setSettlementOwnerDetailId(settlementOwnerDetailId);
+//        mq.setSettlementDriverDetailId(settlementDriverDetailId);
+//        settlementMqHandlerService.settlementDetailAdd(mq);
+
+        settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
 
         return Result.ok();
     }

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

@@ -269,12 +269,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         fieldList.add(new ExcelField(3, "收货地址", "receiveAddressShorter", 5000));
         fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
         fieldList.add(new ExcelField(5, "提取吨数", "extractWeight", 5000));
-        fieldList.add(new ExcelField(6, "已派单", "dispatchedOrders", 5000));
-        fieldList.add(new ExcelField(7, "已抢单吨数", "alreadyTransportWeight", 5000));
-        fieldList.add(new ExcelField(8, "未抢单吨数", "residueTransportWeight", 5000));
-        fieldList.add(new ExcelField(9, "已装车吨数", "alreadyLoadWeight", 5000));
-        fieldList.add(new ExcelField(10, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(11, "货单状态", "orderGoodsStatus", 5000));
+        fieldList.add(new ExcelField(6, "已抢单吨数", "alreadyTransportWeight", 5000));
+        fieldList.add(new ExcelField(7, "未抢单吨数", "residueTransportWeight", 5000));
+        fieldList.add(new ExcelField(8, "已装车吨数", "alreadyLoadWeight", 5000));
+        fieldList.add(new ExcelField(9, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(10, "货单状态", "orderGoodsStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -287,7 +286,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
             rowData.add(new ExcelData(vo.getGoodsName()));
             rowData.add(new ExcelData(vo.getExtractWeight()));
-            rowData.add(new ExcelData(vo.getDispatchedOrders()));
             rowData.add(new ExcelData(vo.getAlreadyTransportWeight()));
             rowData.add(new ExcelData(vo.getResidueTransportWeight()));
             rowData.add(new ExcelData(vo.getAlreadyLoadWeight()));

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

@@ -66,10 +66,6 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 
-        // 运单同步
-        settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
-        settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
-
         brokerService.orderChildSync(transportParam);
     }
 

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

@@ -58,6 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import static com.clx.performance.enums.PerformanceResultEnum.DATA_NOT_FIND;
 
 
 /**
@@ -458,22 +459,17 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
             rowData.add(new ExcelData(dto.getGoodsName()));
             rowData.add(new ExcelData(dto.getWeight()));
-            rowData.add(new ExcelData(dto.getFreightPrice()));
-            rowData.add(new ExcelData(dto.getFreight()));
+            rowData.add(new ExcelData(dto.getFreightPrice()==null?null:dto.getFreightPrice().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getFreight()==null?null:dto.getFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossWeight()));
-            rowData.add(new ExcelData(dto.getLossPrice()));
-            rowData.add(new ExcelData(dto.getLossFreight()));
-            rowData.add(new ExcelData(dto.getFreightPrice()));
-            rowData.add(new ExcelData(dto.getFreight()));
-            rowData.add(new ExcelData(dto.getLossPrice()));
-            rowData.add(new ExcelData(dto.getLossWeight()));
-            rowData.add(new ExcelData(dto.getLossFreight()));
+            rowData.add(new ExcelData(dto.getLossPrice()==null?null:dto.getLossPrice().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLossFreight()==null?null:dto.getLossFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate()));
-            rowData.add(new ExcelData(dto.getInvoiceServiceFee()));
-            rowData.add(new ExcelData(dto.getPrepayFreight()));
-            rowData.add(new ExcelData(dto.getLoanFreight()));
-            rowData.add(new ExcelData(dto.getSettlementFreight()));
-            rowData.add(new ExcelData(dto.getInvoiceFreight()));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee()==null?null:dto.getInvoiceServiceFee().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getPrepayFreight()==null?null:dto.getPrepayFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLoanFreight()==null?null:dto.getLoanFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getSettlementFreight()==null?null:dto.getSettlementFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(SettlementOwnerDetailEnum.HandleStatus.getMsgByCode(dto.getHandleStatus())));
             rowData.add(new ExcelData(dto.getOrderNo()));
@@ -557,19 +553,19 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getUnloadTare()));
             rowData.add(new ExcelData(dto.getUnloadNet()));
             rowData.add(new ExcelData(dto.getWeight()));
-            rowData.add(new ExcelData(dto.getFreightPrice().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getFreightPrice()==null?null:dto.getFreightPrice().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getFreight()==null?null:dto.getFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossWeight()));
-            rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getDriverFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLossPrice()==null?null:dto.getLossPrice().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLossFreight()==null?null:dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getDriverFreight()==null?null:dto.getDriverFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
-            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee()==null?null:dto.getInvoiceServiceFee().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getPrepayFreight()==null?null:dto.getPrepayFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getLoanFreight()==null?null:dto.getLoanFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getSettlementFreight()==null?null:dto.getSettlementFreight().movePointLeft(2)));
 
-            rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(dto.getOrderNo()));
@@ -690,6 +686,10 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         // 解析上传的Excel文件
         EasyExcel.read(file.getInputStream(), InvoiceData.class, new InvoiceDataListener(invoiceDataList,settlementOwnerDetailDao)).sheet().doRead();
 
+        if (invoiceDataList.isEmpty()) {
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件为空");
+        }
+
         boolean verifyResult = invoiceDataList.stream().allMatch(item -> "校验通过".equals(item.getRemark()));
         Result<String> uploadResult = null;
         if (!verifyResult) {

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

@@ -522,7 +522,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getDriverFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getDriverFreight()==null?null:dto.getDriverFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getCreateTime()));
             rowData.add(new ExcelData(SettlementOwnerEnum.Status.getMsgByCode(dto.getStatus())));