Merge branch 'bug_test_20240715' into dev

performance-api/src/main/java/com/clx/performance/param/pc/PageOrderGoodsListParam.java

@@ -33,5 +33,11 @@ public class PageOrderGoodsListParam extends PageParam {
     @ApiModelProperty(value = "用车类型： 1平台车辆 2部分平台车辆 3自有车辆")
     private Integer truckDemand;
 
+    @ApiModelProperty(value="发货地址",example = "北京")
+    private String sendAddress;
+
+    @ApiModelProperty(value="收货地址",example = "黄羊城")
+    private String receiveAddress;
+
 
 }

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

@@ -420,18 +420,21 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
         fieldList.add(new ExcelField(2, "开票标识", "invoiceType", 5000));
         fieldList.add(new ExcelField(3, "货主编码", "ownerUserNo", 5000));
-        fieldList.add(new ExcelField(4, "结算方式", "settlementWay", 5000));
-        fieldList.add(new ExcelField(5, "订单编号", "orderNo", 15000));
-        fieldList.add(new ExcelField(6, "实际净重", "weight", 5000));
-        fieldList.add(new ExcelField(7, "实际运费金额", "freight", 5000));
-        fieldList.add(new ExcelField(8, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(9, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "开票服务费", "invoiceServiceFee", 5000));
-        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(13, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(14, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(15, "状态", "status", 5000));
+        fieldList.add(new ExcelField(4, "货主名称", "ownerUserName", 5000));
+        fieldList.add(new ExcelField(5, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(6, "订单编号", "orderNo", 15000));
+        fieldList.add(new ExcelField(7, "实际净重", "weight", 5000));
+        fieldList.add(new ExcelField(8, "实际运费金额", "freight", 5000));
+        fieldList.add(new ExcelField(9, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(10, "货损吨数", "lossWeight", 5000));
+        fieldList.add(new ExcelField(11, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(12, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
+        fieldList.add(new ExcelField(14, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(15, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(16, "开票公司", "invoiceCompany", 5000));
+        fieldList.add(new ExcelField(17, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(18, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -444,6 +447,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(String.valueOf(dto.getOwnerUserNo())));
+            rowData.add(new ExcelData(dto.getOwnerName()));
             rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(dto.getSettlementWay())));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getWeight()));
@@ -452,8 +456,10 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
+            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.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getCreateTime()));
             rowData.add(new ExcelData(SettlementOwnerEnum.Status.getMsgByCode(dto.getStatus())));
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -122,9 +122,8 @@ public class OrderChildSqlProvider {
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}
             if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
-
-            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address = #{param.sendAddress}");}
-            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address= #{param.receiveAddress}");}
+            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("send_address like CONCAT(#{param.sendAddress},'%') ");}
+            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("receive_address like CONCAT(#{param.receiveAddress},'%') ");}
             if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
             if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no like '%"+ param.getTruckNo() +"%'");}
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -82,6 +82,8 @@ public class OrderGoodsSqlProvider {
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
                 WHERE("a.order_goods_no = #{param.orderGoodsNo}");
             }
+            if(StringUtils.isNotBlank(param.getSendAddress())){WHERE("a.send_address_shorter like CONCAT(#{param.sendAddress},'%') ");}
+            if(StringUtils.isNotBlank(param.getReceiveAddress())){WHERE("a.receive_address_shorter like CONCAT(#{param.receiveAddress},'%') ");}
             ORDER_BY("a.create_time desc");
         }}.toString();
         return sql;

performance-web/src/main/java/com/clx/performance/struct/AddressStruct.java

@@ -13,7 +13,7 @@ import java.util.Objects;
 public interface AddressStruct {
 
     @Mapping(target = "address", source = "item.addressShorter")
-    @Mapping(target = "addressDetail", expression = "java(Objects.isNull(item)? null : addressDetail(item))")
+    @Mapping(target = "addressDetail", source = "item.address")
     Address convert(FeignAddressVO.Address item);
 
     default String addressDetail(FeignAddressVO.Address item){