diff --git a/hiver-admin/src/main/resources/application.yml b/hiver-admin/src/main/resources/application.yml index 6a77078a..eadea1d0 100644 --- a/hiver-admin/src/main/resources/application.yml +++ b/hiver-admin/src/main/resources/application.yml @@ -334,8 +334,13 @@ ignored: - /hiver/app/productPicture/getProductPictureByProductId # 根据店铺id获取店铺二维码信息 - /hiver/app/shop/getshopIconById + # 物流订单详情 + - /hiver/app/logisticsOrder/getLogisticsOrderDetail # 临时增加 + - /hiver/app/logisticsOrder/addLogisticsOrder + - /hiver/app/logisticsEntruckingLog/getDateLogisticsEntruckingLogPageList + - /hiver/app/logisticsEntruckingLog/batchAddLogisticsEntruckingLog # 限流及黑名单不拦截的路径 limitUrls: - /**/*.js diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 9fd95444..788db0b3 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • - 05, 2024 21:22:19 + 05, 2024 13:53:27
  • @@ -84,7 +84,7 @@

    passTest

    -

    21:22:20 / 0.034 secs

    +

    13:53:28 / 0.024 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -09.05.2024 21:22:20 -09.05.2024 21:22:20 -0.034 secs +09.05.2024 13:53:28 +09.05.2024 13:53:28 +0.024 secs
    @@ -104,7 +104,7 @@ Pass - 21:22:20 + 13:53:28 Test passed @@ -128,13 +128,13 @@

    Started

    -

    05, 2024 21:22:19

    +

    05, 2024 13:53:27

    Ended

    -

    05, 2024 21:22:20

    +

    05, 2024 13:53:28

    diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java index 4f1d3617..2bd38e34 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java @@ -154,4 +154,17 @@ public class LogisticsOrderController { return new ResultUtil>().setData(logisticsOrderService.getLogisticsOrderChangeLog(orderId)); } + + /** + * 查询物流订单详情 + * @author 王富康 + * @date 2024/9/5 + * @param orderId + * @return Result + */ + @RequestMapping(value = "/getLogisticsOrderDetail", method = RequestMethod.GET) + @ApiOperation(value = "查询物流订单详情") + public Result getLogisticsOrderDetail(String orderId) { + return new ResultUtil().setData(logisticsOrderService.getById(orderId)); + } } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java index aada0b17..8769a445 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java @@ -148,5 +148,9 @@ public class LogisticsOrder extends HiverBaseEntity { @ApiModelProperty(value = "代收货款") private String paymentForGoods; + @CompareField(name = "中转另付 0 否 1是") + @ApiModelProperty(value = "中转另付 0 否 1是") + private String transferAddition; + } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java index 754731f2..68e0f27b 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java @@ -72,5 +72,8 @@ public class LogisticsOrderQueryVo extends HiverBasePageQuery { @ApiModelProperty(value = "结束时间") private String endDate; + @ApiModelProperty(value = "搜索字段") + private String searchStr; + } diff --git a/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml index 2ab3c3e8..9b704f02 100644 --- a/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml @@ -171,12 +171,11 @@ - update t_logistics_entrucking_log - set del_flag = '1' - where del_flag = '0' - - and car_number = #{listItem.carNumber} and company_id = #{listItem.companyId} + + update t_logistics_entrucking_log + set del_flag = '1' + where del_flag = '0' and car_number = #{listItem.carNumber} and company_id = #{listItem.companyId} + and create_time BETWEEN #{nowDate} AND #{afterDay} - and create_time BETWEEN #{nowDate} AND #{afterDay} \ No newline at end of file diff --git a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml index 14c3ab43..d0885d13 100644 --- a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml @@ -39,13 +39,14 @@ + id, create_by, create_by_name, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name, shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, - transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name,image_path, payment_for_goods + transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name,image_path, payment_for_goods, transfer_addition