From 40726789d92f2c03405a34fc1b6835a0dadf6759 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 5 Sep 2024 13:56:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=BC=80=E5=8D=95=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=89=8D=E5=8F=B0=E5=BA=94=E8=AF=A5=E4=BC=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=90=9C=E5=87=A0?=
 =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E4=BB=B6=EF=BC=88searchStr=EF=BC=89=20?=
 =?UTF-8?q?=E6=94=B6=E5=8F=91=E8=B4=A7=E4=BA=BA=E6=A8=A1=E7=B3=8A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=B9=9F=E6=98=AF(=E6=B2=A1=E7=90=86=E8=A7=A3?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E8=AF=9D=E4=B9=9F=E6=98=AF=E4=B8=8A=E8=BE=B9?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=8A=A0=E5=A5=BD=E4=BA=86?=
 =?UTF-8?q?)=202.=20=E5=BC=80=E5=8D=95=E8=A1=A8=E4=BB=B7=E6=A0=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9Atransfer=5Faddition=20=E4=B8=AD=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=A6=E4=BB=98=200=20=E5=90=A6=201=E6=98=AF=EF=BC=9B=203.?=
 =?UTF-8?q?=20=E9=80=9A=E4=B9=89=E5=8D=83=E9=97=AE=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9AobjectName=EF=BC=88=E6=B3=A8?=
 =?UTF-8?q?=E6=84=8F=E6=8C=87=E4=BB=A4=EF=BC=8C=E6=B2=A1=E6=9C=89=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC""=EF=BC=89=EF=BC=9B=204.=20=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=AE=BF=E9=97=AE=E9=99=90=E5=88=B6=EF=BC=9B=20#=20?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=20-=20/h?=
 =?UTF-8?q?iver/app/logisticsOrder/getLogisticsOrderDetail=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=88=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=89=EF=BC=9A?=
 =?UTF-8?q?orderId=205.=20=E8=A3=85=E8=BD=A6=E6=96=B0=E5=A2=9E=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  5 +++++
 hiver-admin/test-output/test-report.html      | 16 +++++++--------
 .../controller/LogisticsOrderController.java  | 13 ++++++++++++
 .../logisticsorder/entity/LogisticsOrder.java |  4 ++++
 .../vo/LogisticsOrderQueryVo.java             |  3 +++
 .../mapper/LogisticsEntruckingLogMapper.xml   | 11 +++++-----
 .../resources/mapper/LogisticsOrderMapper.xml | 20 +++++++++++++++----
 .../impl/PurchaseOcrPictureServiceImpl.java   |  2 ++
 .../purchaseocr/vo/LogisticsOrderOfAiVo.java  |  3 +++
 .../java/cc/hiver/mall/utils/AliOcrUtil.java  |  2 +-
 10 files changed, 60 insertions(+), 19 deletions(-)

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 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">���� 05, 2024 21:22:19</span></a>
+<a href="#"><span class="badge badge-primary">���� 05, 2024 13:53:27</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>21:22:20 ����</span> / <span>0.034 secs</span></p>
+            <p class="text-sm"><span>13:53:28 ����</span> / <span>0.024 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>09.05.2024 21:22:20</span>
-<span class='badge badge-danger'>09.05.2024 21:22:20</span>
-<span class='badge badge-default'>0.034 secs</span>
+<span class='badge badge-success'>09.05.2024 13:53:28</span>
+<span class='badge badge-danger'>09.05.2024 13:53:28</span>
+<span class='badge badge-default'>0.024 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>21:22:20</td>
+        <td>13:53:28</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>���� 05, 2024 21:22:19</h3>
+<h3>���� 05, 2024 13:53:27</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>���� 05, 2024 21:22:20</h3>
+<h3>���� 05, 2024 13:53:28</h3>
 </div></div>
 </div>
 <div class="col-md-3">
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<List<LogisticsOrderChangeLogVo>>().setData(logisticsOrderService.getLogisticsOrderChangeLog(orderId));
     }
+
+    /**
+     * 查询物流订单详情
+     * @author 王富康
+     * @date 2024/9/5
+     * @param orderId
+     * @return Result<LogisticsOrder>
+     */
+    @RequestMapping(value = "/getLogisticsOrderDetail", method = RequestMethod.GET)
+    @ApiOperation(value = "查询物流订单详情")
+    public Result<LogisticsOrder> getLogisticsOrderDetail(String orderId) {
+        return new ResultUtil<LogisticsOrder>().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 @@
   </select>
 
   <update id="deleteByCarNumberAndCompanyId" >
-    update t_logistics_entrucking_log
-    set del_flag = '1'
-    where del_flag = '0'
-    <foreach close=")" collection="logisticsEntruckingLogs" item="listItem" open="(" separator=",">
-      and car_number = #{listItem.carNumber} and company_id = #{listItem.companyId}
+    <foreach collection="logisticsEntruckingLogs" item="listItem" separator=";" open="" close="">
+      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}
     </foreach>
-    and create_time BETWEEN #{nowDate} AND #{afterDay}
   </update>
 </mapper>
\ 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 @@
     <result column="receiving_user_name" jdbcType="VARCHAR" property="receivingUserName" />
     <result column="image_path" jdbcType="VARCHAR" property="imagePath" />
     <result column="payment_for_goods" jdbcType="VARCHAR" property="paymentForGoods" />
+    <result column="transfer_addition" jdbcType="VARCHAR" property="transferAddition" />
   </resultMap>
 
   <sql id="Base_Column_List">
     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
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -65,7 +66,7 @@
         (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)
     values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createByName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
       #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
       #{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{circuitId,jdbcType=VARCHAR}, #{circuitName,jdbcType=VARCHAR},
@@ -75,7 +76,8 @@
       #{weight,jdbcType=DECIMAL}, #{count,jdbcType=INTEGER}, #{freight,jdbcType=DECIMAL}, #{premium,jdbcType=DECIMAL},
       #{transitFee,jdbcType=DECIMAL}, #{tips,jdbcType=DECIMAL}, #{methodOfSettlement,jdbcType=VARCHAR}, #{cost,jdbcType=DECIMAL},
       #{allCost,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR}, #{objectName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
-      #{receivingUserId,jdbcType=VARCHAR}, #{receivingUserName,jdbcType=VARCHAR},#{imagePath,jdbcType=VARCHAR}, #{paymentForGoods,jdbcType=VARCHAR})
+      #{receivingUserId,jdbcType=VARCHAR}, #{receivingUserName,jdbcType=VARCHAR},#{imagePath,jdbcType=VARCHAR}, #{paymentForGoods,jdbcType=VARCHAR},
+      #{transferAddition,jdbcType=VARCHAR})
   </insert>
 
   <!--管理商品分页列表-->
@@ -128,11 +130,21 @@
       <if test='queryParams.orderNumber!=null and queryParams.orderNumber.trim() neq ""'>
         AND order_number like concat('%',#{queryParams.orderNumber},'%')
       </if>
-
       <!--开始时间、结束时间-->
       <if test="queryParams.startDate!=null and queryParams.endDate!=null">
         AND create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate}
       </if>
+      <!-- 开单模糊搜索前台应该传一个字段，搜几个条件 -->
+      <if test="queryParams.searchStr != null and queryParams.searchStr != ''">
+        and (
+        company_name like concat('%',#{queryParams.searchStr},'%')
+        or circuit_name like concat('%',#{queryParams.searchStr},'%')
+        or shipper_name like concat('%',#{queryParams.searchStr},'%')
+        or shipper_mobile like concat('%',#{queryParams.searchStr},'%')
+        or receiver_name like concat('%',#{queryParams.searchStr},'%')
+        or receiver_mobile like concat('%',#{queryParams.searchStr},'%')
+        )
+      </if>
     </where>
     ORDER BY
     create_time desc
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/service/impl/PurchaseOcrPictureServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/service/impl/PurchaseOcrPictureServiceImpl.java
index 7e57a684..6238eb3b 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/service/impl/PurchaseOcrPictureServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/service/impl/PurchaseOcrPictureServiceImpl.java
@@ -608,6 +608,8 @@ public class PurchaseOcrPictureServiceImpl implements PurchaseOcrPictureService
                     }
                 }
                 logisticsOrderOfAiVo.setPremium(premium);
+                final String objectName = object.getString("objectName");
+                logisticsOrderOfAiVo.setObjectName(objectName);
                 logisticsOrderOfAiVos.add(logisticsOrderOfAiVo);
             }
         } catch (Exception e) {
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/vo/LogisticsOrderOfAiVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/vo/LogisticsOrderOfAiVo.java
index a03cb945..302afa8d 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/vo/LogisticsOrderOfAiVo.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/purchaseocr/vo/LogisticsOrderOfAiVo.java
@@ -34,4 +34,7 @@ public class LogisticsOrderOfAiVo {
 
     @ApiModelProperty(value = "到达站")
     private String arrivalStationName;
+
+    @ApiModelProperty(value = "物品")
+    private String objectName;
 }
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
index 48a9df04..d5106824 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
@@ -1258,7 +1258,7 @@ public class AliOcrUtil {
         final Message systemMsg =
                 Message.builder().role(Role.SYSTEM.getValue()).content("You are a helpful assistant.").build();
         questionMsg += "你是一个物流开票员；\n" +
-                "请帮我把所有内容封装为JSON，json格式为：{\"shipperName\":\"发货人\",\"shipperMobile\":\"发货电话\",\"receiverName\":\"收货人\",\"receiverMobile\":\"收货电话\",\"weight\":\"重量\",\"count\":\"数量\",\"tips\":\"小费\",\"premium\":\"保费\",\"arrivalStationName\":\"到达站\"}" +
+                "请帮我把所有内容封装为JSON，json格式为：{\"shipperName\":\"发货人\",\"shipperMobile\":\"发货电话\",\"receiverName\":\"收货人\",\"receiverMobile\":\"收货电话\",\"weight\":\"重量\",\"count\":\"数量\",\"tips\":\"小费\",\"premium\":\"保费\",\"arrivalStationName\":\"到达站\",\"objectName\":\"物品\"}" +
                 "1.没有识别到的字段，赋值\"\";" +
                 "2.weight、count、tips、premium这几个字段只返回数字；" +
                 "3.只输出1条JSON数据即可，禁止返回除JSON数据外的任何内容！返回的JSON数据不用换行，以最快的速度返回！";