feat: 订单列表页面相关优化处理；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/BizWaybillOrder.java

@@ -168,7 +168,7 @@ public class BizWaybillOrder extends BaseEntity
     private String nickName;
 
     /** 产品类型 */
-    @Excel(name = "产品类型")
+    @Excel(name = "产品类型", readConverterExp = "ed-m-0001=京东标快,ed-m-0002=京东特快,fr-m-0004=特快重货,1=顺丰特快,2=顺丰标快")
     private String productCode;
 
     /** 增值服务 */
@@ -177,6 +177,10 @@ public class BizWaybillOrder extends BaseEntity
     /** 面单pdf */
     private String pdfUrl;
 
+    /** 运单费用 */
+    @Excel(name = "运单费用")
+    private BigDecimal totalAmount;
+
     public void setWaybillId(Long waybillId) 
     {
         this.waybillId = waybillId;
@@ -555,6 +559,14 @@ public class BizWaybillOrder extends BaseEntity
         this.pdfUrl = pdfUrl;
     }
 
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -598,6 +610,10 @@ public class BizWaybillOrder extends BaseEntity
             .append("userId", getUserId())
             .append("productCode", getProductCode())
             .append("addedService", getAddedService())
+            .append("deptName", getDeptName())
+            .append("nickName", getNickName())
+            .append("pdfUrl", getPdfUrl())
+            .append("totalAmount", getTotalAmount())
             .toString();
     }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/JDLogisticsService.java

@@ -730,7 +730,7 @@ public class JDLogisticsService  implements LogisticsService {
                 queryRenderDTO.setTemplateCode("jdky100x113");
             }
             queryRenderDTO.setOperator("瑞鲸速达");
-            queryRenderDTO.setTaskId(bizWaybillOrder.getWaybillNo());
+            queryRenderDTO.setTaskId(redisIdGenerator.generateUniqueId("JDMDTASK"));
 
             List<PrintDataDTO> printDataDTOList = new ArrayList<>();
             PrintDataDTO printDataDTO = new PrintDataDTO();

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillOrderMapper.xml

@@ -49,16 +49,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="nick_name"    />
         <result property="deptName"    column="dept_name"    />
         <result property="pdfUrl" column="pdf_url" />
+        <result property="totalAmount" column="total_amount" />
     </resultMap>
 
     <sql id="selectBizWaybillOrderVo">
         select bwo.waybill_id, bwo.waybill_no, bwo.external_waybill_no, bwo.order_type, bwo.sender_name, bwo.sender_phone, bwo.sender_province, bwo.sender_city, bwo.sender_county, bwo.sender_address, bwo.receiver_name,
                bwo.receiver_phone, bwo.receiver_province, bwo.receiver_city, bwo.receiver_county, bwo.receiver_address, bwo.goods_name, bwo.goods_weight, bwo.goods_volume, bwo.goods_qty, bwo.order_status, bwo.pickup_type,
                bwo.send_start_time, bwo.send_end_time, bwo.pickup_time, bwo.delivery_time, bwo.sign_time, bwo.cancel_reason, bwo.parent_waybill_id, bwo.invoice_flag, bwo.adjust_flag, bwo.remark, bwo.create_time, bwo.update_time,
-               bwo.del_flag, bwo.create_by, bwo.update_by, bwo.dept_id, bwo.user_id, bwo.product_code, bwo.added_service, u.nick_name, d.dept_name, bwo.pdf_url
+               bwo.del_flag, bwo.create_by, bwo.update_by, bwo.dept_id, bwo.user_id, bwo.product_code, bwo.added_service, u.nick_name, d.dept_name, bwo.pdf_url,
+                sum(bwcd.amount) as total_amount
         from biz_waybill_order bwo
                  left join sys_user u on bwo.user_id = u.user_id
                  left join sys_dept d on bwo.dept_id = d.dept_id
+                 left join biz_waybill_cost_details bwcd on bwo.waybill_id = bwcd.waybill_id
     </sql>
 
     <select id="selectBizWaybillOrderList" parameterType="com.ruoyi.logistics.domain.BizWaybillOrder" resultMap="BizWaybillOrderResult">
@@ -99,10 +102,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 sender_phone like concat('%', #{searchKeyword}, '%') or
                 receiver_name like concat('%', #{searchKeyword}, '%') or
                 receiver_phone like concat('%', #{searchKeyword}, '%'))</if>
-
+            <if test="nickName != null and nickName != ''"> and u.nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="deptName != null and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(bwo.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(bwo.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
+        group by bwo.waybill_id
         order by create_time desc
     </select>