售后物流编号

fs-admin/src/main/java/com/fs/store/controller/FsStoreAfterSalesController.java

@@ -8,6 +8,8 @@ import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
+import com.fs.express.FsStoreDeliversService;
+import com.fs.express.cache.FsStoreDeliversCacheService;
 import com.fs.store.domain.*;
 
 import com.fs.store.param.FsStoreAfterSalesAudit1Param;
@@ -16,6 +18,7 @@ import com.fs.store.param.FsStoreAfterSalesCancelParam;
 import com.fs.store.param.FsStoreAfterSalesRefundParam;
 import com.fs.store.service.*;
 import com.fs.store.vo.FsStoreAfterSalesVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +52,12 @@ public class FsStoreAfterSalesController extends BaseController
 
     @Autowired
     private TokenService tokenService;
+
+    @Autowired
+    private FsStoreDeliversCacheService fsStoreDeliversCacheService;
+
+    @Autowired
+    private FsStoreDeliversService fsStoreDeliversService;
     /**
      * 查询售后记录列表
      */
@@ -104,6 +113,20 @@ public class FsStoreAfterSalesController extends BaseController
         FsUser user=userService.selectFsUserById(afterSales.getUserId());
         user.setPhone(ParseUtils.parsePhone(user.getPhone()));
         FsStoreOrder order=fsStoreOrderService.selectFsStoreOrderByOrderCode(afterSales.getOrderCode());
+
+        if(order != null) {
+            afterSales.setPhoneNumber(order.getUserPhone());
+            afterSales.setAddress(order.getUserAddress());
+            afterSales.setConsignee(order.getRealName());
+        }
+        List<FsStoreDelivers> byOrderId = fsStoreDeliversService.findByOrderId(order.getId());
+        if(CollectionUtils.isNotEmpty(byOrderId)){
+            FsStoreDelivers delivers = byOrderId.get(0);
+            afterSales.setDeliveryName(delivers.getDeliverName());
+            afterSales.setDeliverySn(delivers.getDeliverSn());
+            afterSales.setDeliveryId(delivers.getDeliverId());
+            afterSales.setDeliveryStatus(delivers.getStatus());
+        }
         return R.ok().put("afterSales",afterSales).put("items",items).put("logs",logs).put("user",user).put("order",order);
     }
 

fs-admin/src/main/java/com/fs/store/controller/FsStoreHealthOrderController.java

@@ -35,31 +35,13 @@ import java.util.List;
 @RestController
 @RequestMapping("/store/storeOrder")
 public class FsStoreHealthOrderController extends BaseController {
-    @Autowired
-    private IFsExpressService expressService;
     @Autowired
     private IFsStoreOrderService fsStoreOrderService;
     @Autowired
     private IFsStoreOrderItemService orderItemService;
 
-    @Autowired
-    private IFsUserService userService;
-
-    @Autowired
-    private IFsStoreOrderStatusService orderStatusService;
-
-    @Autowired
-    IErpOrderService erpOrderService;
-    @Autowired
-    IFsStorePaymentService paymentService;
-
-    @Autowired
-    private ICompanyMoneyLogsService moneyLogsService;
-
     @Autowired
     private IFsStoreProductCacheService fsStoreProductCacheService;
-    @Autowired
-    private FsWarehouseCacheServiceImpl fsWarehouseCacheService;
 
     /**
      * 查询健康商城订单列表

fs-service-system/src/main/java/com/fs/express/FsStoreDeliversService.java

@@ -59,4 +59,5 @@ public interface FsStoreDeliversService {
 
     void editDeliveryId(FsStoreDelivers deliveryDTO);
 
+    FsStoreDelivers findByOrderCode(String orderCode);
 }

fs-service-system/src/main/java/com/fs/express/impl/FsStoreDeliversServiceImpl.java

@@ -177,4 +177,9 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
             fsStoreDeliversMapper.update(deliveryDTO);
         }
     }
+
+    @Override
+    public FsStoreDelivers findByOrderCode(String orderCode) {
+        return fsStoreDeliversMapper.findByOrderCode(orderCode);
+    }
 }

fs-service-system/src/main/java/com/fs/store/domain/FsStoreAfterSales.java

@@ -48,9 +48,12 @@ public class FsStoreAfterSales extends BaseEntity
     private String shipperCode;
 
     /** 物流单号 */
-    @Excel(name = "物流单号")
+    @Excel(name = "物流公司")
     private String deliverySn;
 
+    @Excel(name = "物流单号")
+    private String deliveryId;
+
     /** 物流名称 */
     @Excel(name = "物流名称")
     private String deliveryName;
@@ -261,6 +264,14 @@ public class FsStoreAfterSales extends BaseEntity
         this.deliverySn = deliverySn;
     }
 
+    public String getDeliveryId() {
+        return deliveryId;
+    }
+
+    public void setDeliveryId(String deliveryId) {
+        this.deliveryId = deliveryId;
+    }
+
     public String getDeliveryName() {
         return deliveryName;
     }

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreAfterSalesMapper.java

@@ -81,54 +81,7 @@ public interface FsStoreAfterSalesMapper
             "</script>"})
     List<FsStoreAfterSalesQueryVO>  selectFsStoreAfterSalesListQuery(@Param("maps") FsStoreAfterSalesQueryParam storeAfterSalesParam);
 
-    @Select({"<script> " +
-            "select s.*,o.delivery_status,o.delivery_id,u.phone as user_phone,c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber  from fs_store_after_sales s INNER join fs_store_order o on o.order_code=s.order_code left join fs_user u on s.user_id=u.user_id left join company c on c.company_id=s.company_id left join company_user cu on cu.user_id=s.company_user_id " +
-            "where 1=1 " +
-            "<if test = 'maps.status != null    '> " +
-            "and s.status = #{maps.status} " +
-            "</if>" +
-            "<if test = 'maps.salesStatus != null    '> " +
-            "and s.sales_status = #{maps.salesStatus} " +
-            "</if>" +
-            "<if test = 'maps.orderStatus != null    '> " +
-            "and s.order_status = #{maps.orderStatus} " +
-            "</if>" +
-            "<if test = 'maps.orderCode != null and  maps.orderCode !=  \"\" '> " +
-            "and o.order_code like concat('%', #{maps.orderCode}, '%') " +
-            "</if>" +
-            "<if test = 'maps.deliveryStatus != null    '> " +
-            "and o.delivery_status = #{maps.deliveryStatus} " +
-            "</if>" +
-            "<if test = 'maps.serviceType != null    '> " +
-            "and s.service_type = #{maps.serviceType} " +
-            "</if>" +
-            "<if test = 'maps.companyId != null    '> " +
-            "and s.company_id = #{maps.companyId} " +
-            "</if>" +
-            "<if test = 'maps.companyUserId != null    '> " +
-            "and s.company_user_id = #{maps.companyUserId} " +
-            "</if>" +
-            "<if test = 'maps.deliverySn != null and  maps.deliverySn !=  \"\" '> " +
-            " and ( o.delivery_id like concat('%', #{maps.deliverySn}, '%') or s.delivery_sn like concat('%', #{maps.deliverySn}, '%')) " +
-            "</if>" +
-            "<if test = 'maps.companyUserNickName != null and  maps.companyUserNickName !=  \"\" '> " +
-            "and cu.nick_name like concat('%', #{maps.companyUserNickName}, '%') " +
-            "</if>" +
-            "<if test = 'maps.beginTime != null and maps.beginTime != \"\"   '> " +
-            " AND date_format(s.create_time,'%y%m%d') &gt;= date_format(#{maps.beginTime},'%y%m%d') " +
-            "</if>" +
-            "<if test = 'maps.consigneePhone != null and  maps.consigneePhone !=\"\"     '> " +
-            "and o.user_phone like CONCAT('%',#{maps.consigneePhone},'%') " +
-            "</if>" +
-            "<if test = 'maps.endTime != null and maps.endTime != \"\"   '> " +
-            " AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{maps.endTime},'%y%m%d') " +
-            "</if>" +
-            "<if test = 'maps.deptId != null    '> " +
-            "  AND (o.dept_id = #{maps.deptId} OR o.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) " +
-            "</if>" +
-            " ${maps.params.dataScope} "+
-            "order by s.create_time desc "+
-            "</script>"})
+
     List<FsStoreAfterSalesVO> selectFsStoreAfterSalesListVO(@Param("maps") FsStoreAfterSales fsStoreAfterSales);
 
 

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreDeliversMapper.java

@@ -110,4 +110,6 @@ public interface FsStoreDeliversMapper {
     @Select("SELECT * FROM fs_store_delivers WHERE deliver_id=#{deliverId} limit 1")
     FsStoreDelivers findByDeliverId(@Param("deliverId") String deliverId);
 
+    @Select("SELECT * FROM fs_store_delivers WHERE order_code=#{order_code} limit 1")
+    FsStoreDelivers findByOrderCode(String orderCode);
 }

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -74,106 +74,7 @@ public interface FsStoreOrderMapper
      */
     public int deleteFsStoreOrderByIds(Long[] ids);
 
-    @Select({"<script> " +
-            "select o.*,u.phone,u.register_code,u.register_date,u.source, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber   from fs_store_order o left join fs_user u on o.user_id=u.user_id  left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id  " +
-            "<if test = 'maps.productName != null and  maps.productName !=  \"\" '> " +
-            "left join fs_store_order_item oi on o.id = oi.order_id "+
-            "left join fs_store_product fsp on fsp.product_id = oi.product_id"+
-            "</if>" +
-            "where 1=1 " +
-            "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
-            "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +
-            "</if>" +
-            "<if test = 'maps.isPayRemain != null      '> " +
-            "and o.is_pay_remain =#{maps.isPayRemain} " +
-            "</if>" +
-            "<if test = 'maps.userId != null      '> " +
-            "and o.user_id =#{maps.userId} " +
-            "</if>" +
-            "<if test = 'maps.deliveryId != null  and  maps.deliveryId !=\"\"    '> " +
-            "and o.delivery_id =#{maps.deliveryId} " +
-            "</if>" +
-            "<if test = 'maps.nickname != null and  maps.nickname !=\"\"     '> " +
-            "and u.nickname like CONCAT('%',#{maps.nickname},'%') " +
-            "</if>" +
-            "<if test = 'maps.realName != null and  maps.realName !=\"\"     '> " +
-            "and o.real_name like CONCAT('%',#{maps.realName},'%') " +
-            "</if>" +
-            "<if test = 'maps.phone != null and  maps.phone !=\"\"     '> " +
-            "and u.phone like CONCAT('%',#{maps.phone},'%') " +
-            "</if>" +
-            "<if test = 'maps.userPhone != null and  maps.userPhone !=\"\"     '> " +
-            "and o.user_phone like CONCAT('%',#{maps.userPhone},'%') " +
-            "</if>" +
-            "<if test = 'maps.status != null    '> " +
-            "and o.status =#{maps.status} " +
-            "</if>" +
-            "<if test = 'maps.isUpload != null and maps.isUpload == 0    '> " +
-            "and o.certificates is null  " +
-            "</if>" +
-            "<if test = 'maps.isUpload != null and maps.isUpload == 1    '> " +
-            "and o.certificates is not null " +
-            "</if>" +
-            "<if test = 'maps.deliveryStatus != null    '> " +
-            "and o.delivery_status =#{maps.deliveryStatus} " +
-            "</if>" +
-            "<if test = 'maps.deliveryPayStatus != null    '> " +
-            "and o.delivery_pay_status =#{maps.deliveryPayStatus} " +
-            "</if>" +
-            "<if test = 'maps.companyId != null    '> " +
-            "and o.company_id =#{maps.companyId} " +
-            "</if>" +
-            "<if test = 'maps.isHealth != null and maps.isHealth !=  \"\"  '> " +
-            "and o.company_id is null " +
-            "</if>" +
-            "<if test = 'maps.notHealth != null '> " +
-            "and o.company_id is not null " +
-            "</if>" +
-            "<if test = 'maps.companyUserId != null    '> " +
-            "and o.company_user_id =#{maps.companyUserId} " +
-            "</if>" +
-            "<if test = 'maps.companyUserNickName != null and  maps.companyUserNickName !=  \"\" '> " +
-            "and cu.nick_name like concat('%', #{maps.companyUserNickName}, '%') " +
-            "</if>" +
-            "<if test = 'maps.productName != null and  maps.productName !=  \"\" '> " +
-            "and fsp.product_name like concat('%', #{maps.productName}, '%') " +
-            "</if>" +
-            "<if test = 'maps.orderType != null    '> " +
-            "and o.order_type =#{maps.orderType} " +
-            "</if>" +
-            "<if test = 'maps.payType != null    '> " +
-            "and o.pay_type =#{maps.payType} " +
-            "</if>" +
-            "<if test = 'maps.scheduleId != null    '> " +
-            "and o.schedule_id =#{maps.scheduleId} " +
-            "</if>" +
-            "<if test = 'maps.createTimeList != null    '> " +
-            " AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
-            " AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
-            "</if>" +
-
-            "<if test = 'maps.deliverySendTimeList != null    '> " +
-            " AND date_format(o.delivery_send_time,'%y%m%d') &gt;= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d') " +
-            " AND date_format(o.delivery_send_time,'%y%m%d') &lt;= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d') " +
-            "</if>" +
 
-            "<if test = 'maps.payTimeList != null    '> " +
-            " AND date_format(o.pay_time,'%y%m%d') &gt;= date_format(#{maps.payTimeList[0]},'%y%m%d') " +
-            " AND date_format(o.pay_time,'%y%m%d') &lt;= date_format(#{maps.payTimeList[1]},'%y%m%d') " +
-            "</if>" +
-            "<if test = 'maps.deliveryImportTimeList != null    '> " +
-            " AND date_format(o.delivery_import_time,'%y%m%d') &gt;= date_format(#{maps.deliveryImportTimeList[0]},'%y%m%d') " +
-            " AND date_format(o.delivery_import_time,'%y%m%d') &lt;= date_format(#{maps.deliveryImportTimeList[1]},'%y%m%d') " +
-            "</if>" +
-            "<if test = 'maps.deptId != null    '> " +
-            "  AND (o.dept_id = #{maps.deptId} OR o.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) " +
-            "</if>" +
-            " ${maps.params.dataScope} "+
-            "<if test = 'maps.productName != null and  maps.productName !=  \"\" '> " +
-            " group by o.id "+
-            "</if>" +
-            " order by o.id desc "+
-            "</script>"})
     List<FsStoreOrderVO> selectFsStoreOrderListVO(@Param("maps")FsStoreOrderParam param);
 
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -564,11 +564,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     vo.setItems(items);
                 }
             }
-            // 查询订单物流状态
-            Integer expressStatusByOrderId = fsStoreDeliversCacheService.findExpressStatusByOrderId(vo.getId());
-            if (expressStatusByOrderId != null) {
-                vo.setDeliveryStatus(expressStatusByOrderId);
-            }
         }
         return list;
     }

fs-service-system/src/main/resources/mapper/store/FsStoreAfterSalesMapper.xml

@@ -63,6 +63,93 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsStoreAfterSalesVo"/>
         where id = #{id}
     </select>
+    <select id="selectFsStoreAfterSalesListVO" resultType="com.fs.store.vo.FsStoreAfterSalesVO">
+        select s.`id`,
+                s.`order_code`,
+                s.`refund_amount`,
+                s.`service_type`,
+                s.`reasons`,
+                s.`explains`,
+                s.`explain_img`,
+                s.`shipper_code`,
+                s.`status`,
+                s.`sales_status`,
+                s.`order_status`,
+                s.`create_time`,
+                s.`is_del`,
+                s.`user_id`,
+                s.`consignee`,
+                s.`phone_number`,
+                s.`address`,
+                s.`company_id`,
+                s.`company_user_id`,
+                s.`is_package`,
+                s.`package_json`,
+               deliver.status as delivery_status,
+               deliver.deliver_id as delivery_id,
+                deliver.deliver_sn as `delivery_sn`,
+                deliver.deliver_name as `delivery_name`,
+               u.phone as user_phone,
+               c.company_name ,cu.nick_name as company_user_nick_name ,
+               cu.phonenumber as company_usere_phonenumber
+                from fs_store_after_sales s
+                    INNER join fs_store_order o
+                        on o.order_code=s.order_code
+                    left join fs_user u
+                        on s.user_id=u.user_id
+                    left join company c
+                        on c.company_id=s.company_id
+                    left join company_user cu
+                        on cu.user_id=s.company_user_id
+                    left join fs_store_delivers deliver
+                        on o.order_code=deliver.order_code
+        <where>
+            <if test = 'maps.status != null'>
+                and s.status = #{maps.status}
+            </if>
+            <if test = 'maps.salesStatus != null'>
+            and s.sales_status = #{maps.salesStatus}
+            </if>
+            <if test = 'maps.orderStatus != null'>
+                and s.order_status = #{maps.orderStatus}
+            </if>
+            <if test = 'maps.orderCode != null and  maps.orderCode != "" '>
+                and o.order_code like concat(#{maps.orderCode}, '%')
+            </if>
+            <if test = 'maps.deliveryStatus != null'>
+                and deliver.status = #{maps.deliveryStatus}
+            </if>
+            <if test = 'maps.serviceType != null'>
+                and s.service_type = #{maps.serviceType}
+            </if>
+            <if test = 'maps.companyId != null'>
+                and s.company_id = #{maps.companyId}
+            </if>
+            <if test = 'maps.companyUserId != null'>
+                and s.company_user_id = #{maps.companyUserId}
+            </if>
+            <if test = 'maps.deliverySn != null and  maps.deliverySn != ""'>
+                and ( deliver.deliver_id like concat(#{maps.deliverySn}, '%') or deliver.deliver_sn like concat(#{maps.deliverySn}, '%'))
+            </if>
+            <if test = 'maps.companyUserNickName != null and  maps.companyUserNickName != ""'>
+                and cu.nick_name like concat(#{maps.companyUserNickName}, '%')
+            </if>
+            <if test = 'maps.beginTime != null and maps.beginTime != ""'>
+                AND date_format(s.create_time,'%y%m%d') &gt;= date_format(#{maps.beginTime},'%y%m%d')
+            </if>
+            <if test = 'maps.consigneePhone != null and  maps.consigneePhone !="" '>
+                and o.user_phone like CONCAT(#{maps.consigneePhone},'%')
+            </if>
+            <if test = 'maps.endTime != null and maps.endTime != ""'>
+                AND date_format(s.create_time,'%y%m%d') &lt;= date_format(#{maps.endTime},'%y%m%d')
+            </if>
+            <if test = 'maps.deptId != null'>
+                AND (o.dept_id = #{maps.deptId} OR o.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) ))
+            </if>
+            ${maps.params.dataScope}
+        </where>
+        order by s.create_time desc
+    </select>
 
     <insert id="insertFsStoreAfterSales" parameterType="FsStoreAfterSales" useGeneratedKeys="true" keyProperty="id">
         insert into fs_store_after_sales

fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

@@ -474,5 +474,203 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE status = 0
         AND create_time < DATE_SUB(NOW(), INTERVAL 1800 MINUTE);
     </select>
+    <select id="selectFsStoreOrderListVO" resultType="com.fs.store.vo.FsStoreOrderVO">
+        select o.`id`,
+        o.`order_code`,
+        o.`extend_order_id`,
+        o.`pay_order_id`,
+        o.`bank_order_id`,
+        o.`user_id`,
+        o.`real_name`,
+        o.`user_phone`,
+        o.`user_address`,
+        o.`cart_id`,
+        o.`freight_price`,
+        o.`total_num`,
+        o.`total_price`,
+        o.`total_postage`,
+        o.`pay_price`,
+        o.`pay_postage`,
+        o.`pay_delivery`,
+        o.`pay_money`,
+        o.`deduction_price`,
+        o.`coupon_id`,
+        o.`coupon_price`,
+        o.`paid`,
+        o.`pay_time`,
+        o.`pay_type`,
+        o.`create_time`,
+        o.`update_time`,
+        o.`status`,
+        o.`refund_status`,
+        o.`refund_reason_wap_img`,
+        o.`refund_reason_wap_explain`,
+        o.`refund_reason_time`,
+        o.`refund_reason_wap`,
+        o.`refund_reason`,
+        o.`refund_price`,
+        deliver.deliver_sn as `delivery_sn`,
+        deliver.deliver_name as `delivery_name`,
+
+        o.`delivery_type`,
+        deliver.deliver_id as `delivery_id`,
+        o.`gain_integral`,
+        o.`use_integral`,
+        o.`pay_integral`,
+        o.`back_integral`,
+        o.`mark`,
+        o.`is_del`,
+        o.`remark`,
+        o.`cost`,
+        o.`verify_code`,
+        o.`store_id`,
+        o.`shipping_type`,
+        o.`is_channel`,
+        o.`is_remind`,
+        o.`is_sys_del`,
+        o.`is_prescribe`,
+        o.`prescribe_id`,
+        o.`company_id`,
+        o.`company_user_id`,
+        o.`is_package`,
+        o.`package_json`,
+        o.`order_type`,
+        o.`package_id`,
+        o.`finish_time`,
+        o.`delivery_status`,
+        o.`delivery_pay_status`,
+        o.`delivery_time`,
+        o.`delivery_pay_time`,
+        o.`delivery_pay_money`,
+        o.`tui_money`,
+        o.`tui_money_status`,
+        o.`delivery_import_time`,
+        o.`tui_user_id`,
+        o.`tui_user_money_status`,
+        o.`order_create_type`,
+        o.`store_house_code`,
+        o.`dept_id`,
+        o.`is_edit_money`,
+        o.`customer_id`,
+        o.`is_pay_remain`,
+        o.`delivery_send_time`,
+        o.`certificates`,
+        o.`upload_time`,
+        o.`schedule_id`,
+        o.`item_json`,
+        o.`order_visit`,
+        o.`service_fee`
+               ,u.phone,u.register_code,u.register_date,
+               u.source, c.company_name ,
+               cu.nick_name as company_user_nick_name ,
+               cu.phonenumber as company_usere_phonenumber
+                from fs_store_order o
+                left join fs_user u
+                    on o.user_id=u.user_id
+                left join company c
+                    on c.company_id=o.company_id
+                left join company_user cu
+                    on cu.user_id=o.company_user_id
+                left join fs_store_delivers deliver
+                    on o.order_code=deliver.order_code
+        <if test = 'maps.productName != null and  maps.productName !=  "" '>
+            left join fs_store_order_item oi on o.id = oi.order_id
+            left join fs_store_product fsp on fsp.product_id = oi.product_id
+        </if>
+        <where>
+            <if test = 'maps.orderCode != null and  maps.orderCode !=""    '>
+                and o.order_code like CONCAT(#{maps.orderCode},'%')
+            </if>
+            <if test = 'maps.isPayRemain != null      '>
+                and o.is_pay_remain =#{maps.isPayRemain}
+            </if>
+            <if test = 'maps.userId != null      '>
+                and o.user_id =#{maps.userId}
+            </if>
+            <if test = 'maps.deliveryId != null  and  maps.deliveryId !=""    '>
+                and deliver.deliver_id =#{maps.deliveryId}
+            </if>
+            <if test = 'maps.nickname != null and  maps.nickname !=""     '>
+                and u.nickname like CONCAT(#{maps.nickname},'%')
+            </if>
+            <if test = 'maps.realName != null and  maps.realName !=""     '>
+                and o.real_name like CONCAT(#{maps.realName},'%')
+            </if>
+            <if test = 'maps.phone != null and  maps.phone !=""     '>
+                and u.phone like CONCAT(#{maps.phone},'%')
+            </if>
+            <if test = 'maps.userPhone != null and  maps.userPhone !=""     '>
+                and o.user_phone like CONCAT(#{maps.userPhone},'%')
+            </if>
+            <if test = 'maps.status != null    '>
+                and o.status =#{maps.status}
+            </if>
+            <if test = 'maps.isUpload != null and maps.isUpload == 0    '>
+                and o.certificates is null
+            </if>
+            <if test = 'maps.isUpload != null and maps.isUpload == 1    '>
+                and o.certificates is not null
+            </if>
+            <if test = 'maps.deliveryStatus != null    '>
+                and deliver.status =#{maps.deliveryStatus}
+            </if>
+            <if test = 'maps.deliveryPayStatus != null    '>
+                and o.delivery_pay_status =#{maps.deliveryPayStatus}
+            </if>
+            <if test = 'maps.companyId != null    '>
+                and o.company_id =#{maps.companyId}
+            </if>
+            <if test = 'maps.isHealth != null and maps.isHealth !=  ""  '>
+                and o.company_id is null
+            </if>
+            <if test = 'maps.notHealth != null '>
+                and o.company_id is not null
+            </if>
+            <if test = 'maps.companyUserId != null    '>
+                and o.company_user_id =#{maps.companyUserId}
+            </if>
+            <if test = 'maps.companyUserNickName != null and  maps.companyUserNickName !=  "" '>
+                and cu.nick_name like concat(#{maps.companyUserNickName}, '%')
+            </if>
+            <if test = 'maps.productName != null and  maps.productName !=  "" '>
+                and fsp.product_name like concat(#{maps.productName}, '%')
+            </if>
+            <if test = 'maps.orderType != null    '>
+                and o.order_type =#{maps.orderType}
+            </if>
+            <if test = 'maps.payType != null    '>
+                and o.pay_type =#{maps.payType}
+            </if>
+            <if test = 'maps.scheduleId != null    '>
+                and o.schedule_id =#{maps.scheduleId}
+            </if>
+            <if test = 'maps.createTimeList != null    '>
+                AND date_format(o.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d')
+                AND date_format(o.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d')
+            </if>
+
+            <if test = 'maps.deliverySendTimeList != null    '>
+                AND date_format(o.delivery_send_time,'%y%m%d') &gt;= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d')
+                AND date_format(o.delivery_send_time,'%y%m%d') &lt;= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d')
+            </if>
+
+            <if test = 'maps.payTimeList != null    '>
+                AND date_format(o.pay_time,'%y%m%d') &gt;= date_format(#{maps.payTimeList[0]},'%y%m%d')
+                AND date_format(o.pay_time,'%y%m%d') &lt;= date_format(#{maps.payTimeList[1]},'%y%m%d')
+            </if>
+            <if test = 'maps.deliveryImportTimeList != null    '>
+                AND date_format(o.delivery_import_time,'%y%m%d') &gt;= date_format(#{maps.deliveryImportTimeList[0]},'%y%m%d')
+                AND date_format(o.delivery_import_time,'%y%m%d') &lt;= date_format(#{maps.deliveryImportTimeList[1]},'%y%m%d')
+            </if>
+            <if test = 'maps.deptId != null    '>
+                AND (o.dept_id = #{maps.deptId} OR o.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) ))
+            </if>
+            ${maps.params.dataScope}
+        </where>
+        <if test = 'maps.productName != null and  maps.productName != "" '>
+            group by o.id
+        </if>
+        order by o.id desc
+    </select>
 
 </mapper>