APP司机首页搜索

performance-api/src/main/java/com/clx/performance/param/app/AppGoodsOrderSearchParam.java

+package com.clx.performance.param.app;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class AppGoodsOrderSearchParam extends PageParam {
+
+    @ApiModelProperty(value = "1：货源地 2: 目的地", example = "1")
+    @NotBlank(message = "查询类型")
+    private Integer searchType;
+
+    @ApiModelProperty(value = "搜索条件", example = "1")
+    private String searchName;
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -3,6 +3,7 @@ package com.clx.performance.controller.app;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
@@ -61,9 +62,11 @@ public class AppGoodsOrderController {
 
     }
 
-    @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
-    @GetMapping("/getCancelOrderGoods")
-    public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
-        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
+    @ApiOperation(value = "APP首页搜索", notes = "<br>By:胡宇帆")
+    @PostMapping("/indexOrderGoodsListSearch")
+    public Result<List<OrderGoodsAPPVO>> indexOrderGoodsListSearch(@RequestParam(value = "param") AppGoodsOrderSearchParam param) {
+        return Result.ok(orderGoodsService.indexOrderGoodsListSearch(param));
     }
+
+
 }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
@@ -93,5 +94,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId);
 
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -254,4 +255,10 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public List<Double> getFreightPrice( Integer sendAddressId,Integer receiveAddressId) {
         return baseMapper.getFreightPrice(sendAddressId,receiveAddressId);
     }
+
+    @Override
+    public IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param) {
+        Page<OrderGoodsAPPVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.indexOrderGoodsListSearch(page,param);
+    }
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -3,6 +3,7 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
@@ -91,4 +92,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     List<Double> getFreightPrice(@Param("sendAddressId") Integer sendAddressId,
                                                   @Param("receiveAddressId") Integer receiveAddressId);
 
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "indexOrderGoodsListSearch")
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(@Param("page")Page<OrderGoodsAPPVO> page, @Param("param")AppGoodsOrderSearchParam param);
+
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -3,6 +3,7 @@ package com.clx.performance.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
@@ -94,4 +95,6 @@ public interface OrderGoodsService {
     Boolean updateSystemAddressId( Integer ownerAddressId, Integer systemAddressId);
 
     FreightEstimateVO listFreightEstimate(OrderChildReportParam param);
+
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param);
 }

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

@@ -12,6 +12,7 @@ import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.extranal.user.DriverService;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.*;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
@@ -750,6 +751,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         return freightEstimateVO;
     }
 
+    @Override
+    public IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(AppGoodsOrderSearchParam param) {
+        return orderGoodsDao.indexOrderGoodsListSearch(param);
+    }
+
     @Override
     public void borrowWeight(OrderGoods orderGoods,String orderChildNo, BigDecimal subOrderGoodsResidue, BigDecimal addAlready,BigDecimal borrowOrderWeight,
             Integer orderGoodsStatus) {

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

 package com.clx.performance.sqlProvider;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
@@ -295,4 +297,35 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
+    public String indexOrderGoodsListSearch(@Param("page") Page<OrderGoodsAPPVO> page, @Param("param") AppGoodsOrderSearchParam param) {
+        String sql = new SQL() {{
+            SELECT("a.id, a.order_no," +
+                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
+                    " a.residue_transport_weight,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
+                    "a.goods_id, a.goods_name, a.pending_order_way," +
+                    " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
+                    " date_format(a.last_arrive_send_time, '%Y-%m-%d %H:%i:%s') as last_arrive_send_time ," +
+                    " date_format(a.pending_order_time, '%Y-%m-%d %H:%i:%s') as pending_order_time," +
+                    " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
+                    " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
+                    "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
+                    "a.user_no,a.user_name");
+            FROM("order_goods a");
+            WHERE("a.stop_flag = "+ OrderGoodsStopEnum.Status.NO.getCode());
+            WHERE("a.last_arrive_send_time >= now()");
+            WHERE("(a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+" or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
+            WHERE("a.residue_transport_weight >=35");
+            if (ObjectUtil.isNotNull(param.getSearchType())) {
+                if (1 == param.getSearchType()) {
+                    WHERE("a.send_address = "+ param.getSearchName());
+                }else if (2 == param.getSearchType()) {
+                    WHERE("a.receive_address = "+ param.getSearchName());
+                }
+            }
+            ORDER_BY("a.pending_order_time desc");
+        }}.toString();
+        return sql;
+    }
+
 }