fix 1.劳务首页增加项目名称过滤字段2.外卖订单增加订单号给值

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/controller/WechatDeliveryOrderController.java

@@ -1,6 +1,7 @@
 package com.tourism.webadmin.app.wechat.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.lang.Snowflake;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.page.PageMethod;
 import com.tourism.common.additional.utils.StringUtils;
@@ -24,6 +25,7 @@ import com.tourism.webadmin.back.vo.DeliveryOrderVo;
 import com.tourism.common.additional.config.ApplicationConfig;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -60,6 +62,7 @@ public class WechatDeliveryOrderController {
         }
         Tuple2<DeliveryOrder, JSONObject> bizData = verifyResult.getData();
         DeliveryOrder deliveryOrder = bizData.getFirst();
+        deliveryOrder.setOrderNo(deliveryOrder.getId());
         deliveryOrder = deliveryOrderService.saveNewWithRelation(deliveryOrder, bizData.getSecond());
         return ResponseResult.success(deliveryOrder.getId().toString());
     }
@@ -177,4 +180,5 @@ public class WechatDeliveryOrderController {
         relationData.put("deliveryOrderItemsList", deliveryOrderItemsList);
         return ResponseResult.success(new Tuple2<>(deliveryOrder, relationData));
     }
+
 }

application-webadmin/src/main/java/com/tourism/webadmin/app/wechat/dto/WechatIndexJobProjectDto.java

@@ -35,4 +35,10 @@ public class WechatIndexJobProjectDto extends PageInfo{
      */
     @Schema(description = "是否启用，0禁用，1启用")
     private Integer enable;
+
+    /**
+     * 项目Title。
+     */
+    @Schema(description = "项目Title")
+    private String jobTitle;
 }

application-webadmin/src/main/java/com/tourism/webadmin/back/dao/mapper/DeliveryOrderMapper.xml

@@ -26,7 +26,7 @@
         <result column="shop_name" jdbcType="VARCHAR" property="shopName"/>
     </resultMap>
 
-    <insert id="insertList">
+    <insert id="insertList" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO tour_delivery_order
             (id,
             delivery_time,
@@ -91,13 +91,14 @@
                 <bind name = "safeDeliveryOrderShopName" value = "'%' + deliveryOrderFilter.shopName + '%'" />
                 AND tour_delivery_order.shop_name LIKE #{safeDeliveryOrderShopName}
             </if>
+            <if test="deliveryOrderFilter.orderNo != null and deliveryOrderFilter.orderNo != ''">
+                <bind name = "safeDeliveryOrderOrderNo" value = "'%' + deliveryOrderFilter.orderNo + '%'" />
+                AND tour_delivery_order.order_no LIKE #{safeDeliveryOrderDeliveryorderNo}
+            </if>
             <if test="deliveryOrderFilter.deliveryPhone != null and deliveryOrderFilter.deliveryPhone != ''">
                 <bind name = "safeDeliveryOrderDeliveryPhone" value = "'%' + deliveryOrderFilter.deliveryPhone + '%'" />
                 AND tour_delivery_order.delivery_phone LIKE #{safeDeliveryOrderDeliveryPhone}
             </if>
-            <if test="deliveryOrderFilter.orderNo != null and deliveryOrderFilter.orderNo != ''">
-                AND tour_delivery_order.order_no = #{deliveryOrderFilter.orderNo}
-            </if>
             <if test="deliveryOrderFilter.payType != null">
                 AND tour_delivery_order.pay_type = #{deliveryOrderFilter.payType}
             </if>