Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/admin/OrderListReq.java

+package com.liquidnet.service.kylin.dto.param.admin;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: OrderListReq
+ * @Package com.liquidnet.client.admin.zhengzai.kylin.dto
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/6 14:17
+ */
+@Data
+public class OrderListReq {
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinOrderTicketsAdminService.java

+package com.liquidnet.service.kylin.service.admin;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
+import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
+import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: 订单服务类
+ * @class: Test
+ * @Package com.liquidnet.service.kylin.service.admin
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/6 11:53
+ */
+public interface IKylinOrderTicketsAdminService extends IService<KylinOrderTickets> {
+    //订单列表(状态 待支付 已支付 倒计时 已失效)
+    List<OrderTicketsListDao> orderList(OrderListReq orderListReq);
+
+    //订单详情
+    OrderDetailsVo orderDetails(String orderId);
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
-import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
-import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.common.enums.BusinessType;
+import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
+import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
+import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
 
@@ -20,101 +22,31 @@ import java.util.List;
  * @date 2021-05-24
  */
 @Controller
-@RequestMapping("/kylin/tickets")
+@RequestMapping("/kylin/order")
 public class KylinOrderTicketsController extends BaseController
 {
-    private String prefix = "zhengzai/kylin/tickets";
+    private String prefix = "zhengzai/kylin/order";
 
-//    @Autowired
-//    private IKylinOrderTicketsService kylinOrderTicketsService;
+    @Autowired
+    private IKylinOrderTicketsAdminService iKylinOrderTicketsAdminService;
 
-    @RequiresPermissions("kylin:tickets:view")
-    @GetMapping()
+    @RequiresPermissions("kylin:order:orderlist:view")
+    @GetMapping("/orderList")
     public String tickets()
     {
-        return prefix + "/tickets";
+        return prefix + "/orderList/orderList";
     }
 
-//    /**
-//     * 查询订单列表
-//     */
-//    @RequiresPermissions("kylin:tickets:list")
-//    @PostMapping("/list")
-//    @ResponseBody
-//    public TableDataInfo list(KylinOrderTickets kylinOrderTickets)
-//    {
-//        startPage();
-//        List<KylinOrderTickets> list = kylinOrderTicketsService.selectKylinOrderTicketsList(kylinOrderTickets);
-//        return getDataTable(list);
-//    }
-//
-//    /**
-//     * 导出订单列表
-//     */
-//    @RequiresPermissions("kylin:tickets:export")
-//    @Log(title = "订单", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    @ResponseBody
-//    public AjaxResult export(KylinOrderTickets kylinOrderTickets)
-//    {
-//        List<KylinOrderTickets> list = kylinOrderTicketsService.selectKylinOrderTicketsList(kylinOrderTickets);
-//        ExcelUtil<KylinOrderTickets> util = new ExcelUtil<KylinOrderTickets>(KylinOrderTickets.class);
-//        return util.exportExcel(list, "订单数据");
-//    }
-//
-//    /**
-//     * 新增订单
-//     */
-//    @GetMapping("/add")
-//    public String add()
-//    {
-//        return prefix + "/add";
-//    }
-//
-//    /**
-//     * 新增保存订单
-//     */
-//    @RequiresPermissions("kylin:tickets:add")
-//    @Log(title = "订单", businessType = BusinessType.INSERT)
-//    @PostMapping("/add")
-//    @ResponseBody
-//    public AjaxResult addSave(KylinOrderTickets kylinOrderTickets)
-//    {
-//        return toAjax(kylinOrderTicketsService.insertKylinOrderTickets(kylinOrderTickets));
-//    }
-//
-//    /**
-//     * 修改订单
-//     */
-//    @GetMapping("/edit/{mid}")
-//    public String edit(@PathVariable("mid") Integer mid, ModelMap mmap)
-//    {
-//        KylinOrderTickets kylinOrderTickets = kylinOrderTicketsService.selectKylinOrderTicketsById(mid);
-//        mmap.put("kylinOrderTickets", kylinOrderTickets);
-//        return prefix + "/edit";
-//    }
-//
-//    /**
-//     * 修改保存订单
-//     */
-//    @RequiresPermissions("kylin:tickets:edit")
-//    @Log(title = "订单", businessType = BusinessType.UPDATE)
-//    @PostMapping("/edit")
-//    @ResponseBody
-//    public AjaxResult editSave(KylinOrderTickets kylinOrderTickets)
-//    {
-//        return toAjax(kylinOrderTicketsService.updateKylinOrderTickets(kylinOrderTickets));
-//    }
-//
-//    /**
-//     * 删除订单
-//     */
-//    @RequiresPermissions("kylin:tickets:remove")
-//    @Log(title = "订单", businessType = BusinessType.DELETE)
-//    @PostMapping( "/remove")
-//    @ResponseBody
-//    public AjaxResult remove(String ids)
-//    {
-//        return toAjax(kylinOrderTicketsService.deleteKylinOrderTicketsByIds(ids));
-//    }
+    /**
+     * 查询订单列表
+     */
+    @RequiresPermissions("kylin:order:orderlist:list")
+    @PostMapping("/orderList/list")
+    @ResponseBody
+    public TableDataInfo list(OrderListReq orderListReq)
+    {
+        startPage();
+        List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq);
+        return getDataTable(list);
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('巡演列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:roadShow:change:performance">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var removeFlag = [[${@permission.hasPermi('kylin:performances:roadShow:change:performance')}]];
+    var prefix = ctx + "kylin/performances/roadShow";
+    $(function () {
+        var options = {
+            url: prefix + "/performance/"+'[[${roadShowId}]]'.replaceAll("\"",""),
+            removeUrl: prefix + "/roadShow/relation",
+            createUrl: prefix + "/addPerformances/"+'[[${roadShowId}]]'.replaceAll("\"",""),
+            modalName: "巡演",
+            method:"get",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'performancesId',
+                    title: '演出id'
+                },
+                {
+                    field: 'title',
+                    title: '巡演名称'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>删除</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.common.utils.StringUtils;
+import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
+import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
+import com.liquidnet.service.kylin.dto.vo.*;
+import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.mapper.*;
+import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: KylinOrderTicketsAdminServiceImpl
+ * @Package com.liquidnet.client.admin.zhengzai.kylin.service.impl
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/6 12:01
+ */
+@Slf4j
+@Service
+public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTicketsMapper, KylinOrderTickets> implements IKylinOrderTicketsAdminService {
+
+    @Autowired
+    private KylinOrderTicketsMapper kylinOrderTicketsMapper;
+
+    @Autowired
+    private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
+
+    @Autowired
+    private KylinPerformancesMapper kylinPerformancesMapper;
+
+    @Autowired
+    private KylinTicketsMapper kylinTicketsMapper;
+
+    @Autowired
+    private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
+
+    @Autowired
+    private ExpressesMapper expressesMapper;
+    
+    @Override
+    public List<OrderTicketsListDao> orderList(OrderListReq orderListReq) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("title", "");
+        List<OrderTicketsListDao> list = kylinOrderTicketsMapper.orderList(map);
+        return list;
+    }
+
+    @Override
+    public OrderDetailsVo orderDetails(String orderId) {
+        OrderDetailsVo vo = new OrderDetailsVo();
+        try {
+            //查询条件
+            LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>();
+            if (!StringUtils.isNotNull(orderId)) {
+                wrapper.eq(KylinOrderTickets::getOrderTicketsId,orderId);
+            }
+            KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
+            KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(wrapper);
+            //获取订单关联关系
+            LambdaQueryWrapper<KylinOrderTicketRelations> relWrapper = new LambdaQueryWrapper<>();
+            if (!StringUtils.isNotNull(orderId)) {
+                relWrapper.eq(KylinOrderTicketRelations::getOrderId,orderId);
+            }
+            KylinOrderTicketRelations  kylinOrderTicketRelations = kylinOrderTicketRelationsMapper.selectOne(relWrapper);
+            BeanUtil.copy(kylinOrderTickets,orderTicketVo);
+            orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId());
+            orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
+            if (null != orderTicketVo) {
+                Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
+                //获取演出信息
+                LambdaQueryWrapper<KylinPerformances> perWrapper = new LambdaQueryWrapper<>();
+                if (!StringUtils.isNotNull(orderTicketVo.getPerformanceId())) {
+                    perWrapper.eq(KylinPerformances::getPerformancesId,orderTicketVo.getPerformanceId());
+                }
+                KylinPerformances kylinPerformances = kylinPerformancesMapper.selectOne(perWrapper);
+                KylinPerformanceVo performanceVo = new KylinPerformanceVo();
+                BeanUtil.copy(kylinPerformances,performanceVo);
+                //获取票种信息
+                LambdaQueryWrapper<KylinTickets> ticketsWrapper = new LambdaQueryWrapper<>();
+                if (!StringUtils.isNotNull(orderTicketVo.getTicketId())) {
+                    ticketsWrapper.eq(KylinTickets::getTicketsId,orderTicketVo.getTicketId());
+                }
+                KylinTickets kylinTickets = kylinTicketsMapper.selectOne(ticketsWrapper);
+                KylinTicketVo ticketVo = new KylinTicketVo();
+                BeanUtil.copy(kylinTickets,ticketVo);
+
+                //获取订单持票实体信息
+                LambdaQueryWrapper<KylinOrderTicketEntities> ticketsEntitiesWrapper = new LambdaQueryWrapper<>();
+                if (!StringUtils.isNotNull(orderTicketVo.getOrderTicketsId())) {
+                    ticketsEntitiesWrapper.eq(KylinOrderTicketEntities::getOrderId,orderTicketVo.getOrderTicketsId());
+                }
+                List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = new ArrayList<>();
+                List<KylinOrderTicketEntities> ticketEntitiesList = kylinOrderTicketEntitiesMapper.selectList(ticketsEntitiesWrapper);
+                for (KylinOrderTicketEntities kylinOrderTicketEntities : ticketEntitiesList) {
+                    KylinOrderTicketEntitiesVo ticketEntitiesVo = new KylinOrderTicketEntitiesVo();
+                    BeanUtil.copy(kylinOrderTicketEntities,ticketEntitiesVo);
+                    kylinOrderTicketEntitiesVoList.add(ticketEntitiesVo);
+                }
+
+                // 数据脱敏
+                for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
+                    if (item.getEnterIdCode().length() == 18) {
+                        item.setEnterIdCode(item.getEnterIdCode().substring(0, 3) + "*************" + item.getEnterIdCode().substring(16));
+                    }
+                    if (item.getEnterMobile().length() == 11) {
+                        item.setEnterMobile(item.getEnterMobile().substring(0, 3) + "****" + item.getEnterMobile().substring(7));
+                    }
+                }
+                //计算 倒计时
+                if (orderTicketVo.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
+                    vo.setRestTime(DateUtil.intervalSeconds(
+                            DateUtil.parse(orderTicketVo.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
+                            DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
+                    ));
+                } else {
+                    vo.setRestTime(0L);
+                }
+                //快递
+                if (null != expresses) {
+                    vo.setExpress_number(expresses.getNumber());
+                    vo.setExpress_company(expresses.getName());
+                    vo.setKuaidi_status(expresses.getStatus());
+                } else {
+                    vo.setExpress_number("");
+                    vo.setExpress_company("");
+                    vo.setKuaidi_status(-2);
+                }
+                vo.setOrderTicketEntitiesVo(kylinOrderTicketEntitiesVoList);
+                vo.setPerformanceVo(performanceVo);
+                vo.setTicketVo(ticketVo);
+                vo.setOrderTicketVo(orderTicketVo);
+            }
+            return vo;
+        } catch (Exception e) {
+            return vo;
+        }
+    }
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderTicketsListDao.java

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PerformanceOrderListDao
+ * @Package com.liquidnet.service.kylin.dao
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/4 13:31
+ */
+@Data
+public class OrderTicketsListDao {
+    String orderTicketsId;
+    String sponsor;
+    String orderCode;
+    String title;
+    String status;
+    String getTicketType;
+    String payType;
+    String paymentType;
+    String tied;
+    String price;
+    String number;
+    String priceMember;
+    String priceTotal;
+    String priceVoucher;
+    String priceActual;
+    String priceExpress;
+    String priceRefund;
+    String refundNumber;
+    String userId;
+    String userName;
+    String userMobile;
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java

 package com.liquidnet.service.kylin.mapper;
 
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
@@ -25,4 +26,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
 
     // 获取订单和购票信息
     List<KylinOrderTickets> getOrderList(@Param("targetId") String targetId, @Param("mid") int mid, @Param("limitNum") int limitNum);
+
+    List<OrderTicketsListDao> orderList(HashMap<String, Object> map);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper">
-
+    <resultMap id="orderTicketsListDaoResult" type="com.liquidnet.service.kylin.dao.OrderTicketsListDao">
+        <result column="performances_id" property="performancesId"/>
+        <result column="tickets_id" property="ticketsId"/>
+        <result column="title" property="title"/>
+        <result column="price" property="price"/>
+        <result column="type" property="type"/>
+        <result column="use_start" property="useStart"/>
+        <result column="total_general" property="totalGeneral"/>
+        <result column="sale_general" property="saleGeneral"/>
+        <result column="surplus_general" property="surplusGeneral"/>
+        <result column="total_sale_price" property="totalSalePrice"/>
+        <result column="total_exchange" property="totalExchange"/>
+        <result column="total_refund_general" property="totalRefundGeneral"/>
+        <result column="total_refund_price" property="totalRefundPrice"/>
+        <result column="total_member_number" property="totalMemberNumber"/>
+        <result column="total_paying_number" property="totalPayingNumber"/>
+        <result column="total_buy_users" property="totalBuyUsers"/>
+    </resultMap>
     <select id="getPriceNum" resultType="java.util.HashMap">
         SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num
         FROM kylin_order_tickets AS o
@@ -45,4 +62,93 @@
         </where>
         LIMIT ${limitNum}
     </select>
+    <select id="orderList" resultMap="PerformanceRecommendAdminDaoResult">
+        SELECT
+        kot.order_tickets_id,
+        kp.sponsor,
+        kot.order_code,
+        kp.title,
+        kots.status,
+        kot.get_ticket_type,
+        kot.pay_type,
+        kot.payment_type,
+        '无' as tied,
+        kot.price,
+        kot.number,
+        kot.price_member,
+        kot.price_total,
+        kot.price_voucher,
+        kot.price_actual,
+        kot.price_express,
+        kot.price_refund,
+        kot.refund_number,
+        kot.user_id,
+        kot.user_name,
+        kot.user_mobile
+        FROM kylin_order_tickets kot
+        inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
+        inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
+        inner join kylin_performances kp on kotr.performance_id = kp.performances_id
+        <where>
+            <if test="orderTicketsId != null  and orderTicketsId != ''"> and order_tickets_id = #{orderTicketsId}</if>
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userMobile != null  and userMobile != ''"> and user_mobile = #{userMobile}</if>
+            <if test="performanceTitle != null  and performanceTitle != ''"> and performance_title = #{performanceTitle}</if>
+            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
+            <if test="payCode != null  and payCode != ''"> and pay_code = #{payCode}</if>
+            <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="orderVersion != null  and orderVersion != ''"> and order_version = #{orderVersion}</if>
+            <if test="number != null "> and number = #{number}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="priceMember != null "> and price_member = #{priceMember}</if>
+            <if test="priceTotal != null "> and price_total = #{priceTotal}</if>
+            <if test="priceVoucher != null "> and price_voucher = #{priceVoucher}</if>
+            <if test="priceActual != null "> and price_actual = #{priceActual}</if>
+            <if test="priceExpress != null "> and price_express = #{priceExpress}</if>
+            <if test="priceRefund != null "> and price_refund = #{priceRefund}</if>
+            <if test="refundNumber != null "> and refund_number = #{refundNumber}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="paymentType != null  and paymentType != ''"> and payment_type = #{paymentType}</if>
+            <if test="timePay != null  and timePay != ''"> and time_pay = #{timePay}</if>
+            <if test="expressContacts != null  and expressContacts != ''"> and express_contacts = #{expressContacts}</if>
+            <if test="expressAddress != null  and expressAddress != ''"> and express_address = #{expressAddress}</if>
+            <if test="expressPhone != null  and expressPhone != ''"> and express_phone = #{expressPhone}</if>
+            <if test="couponType != null  and couponType != ''"> and coupon_type = #{couponType}</if>
+            <if test="getTicketType != null  and getTicketType != ''"> and get_ticket_type = #{getTicketType}</if>
+            <if test="getTicketDescribe != null  and getTicketDescribe != ''"> and get_ticket_describe = #{getTicketDescribe}</if>
+            <if test="payCountdownMinute != null "> and pay_countdown_minute = #{payCountdownMinute}</if>
+            <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
+            <if test="createdAt != null "> and created_at = #{createdAt}</if>
+            <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
+            <if test="orderSourece != null  and orderSourece != ''"> and order_sourece = #{orderSourece}</if>
+        </where>
+        <where>
+            <if test="title!=''">
+                AND title LIKE concat('%', #{title}, '%')
+            </if>
+            <if test="cityName!=''">
+                AND city_name LIKE concat('%', #{cityName}, '%')
+            </if>
+            <if test="status!='-2'">
+                AND ps.STATUS = #{status}
+            </if>
+            <if test="status=='-2'">
+                AND ps.STATUS >= 3 or ps.STATUS = 1
+            </if>
+            <if test="auditStatus!='-2'">
+                AND ps.audit_status = #{auditStatus}
+            </if>
+            <!--            <if test="auditStatus=='-2'">-->
+            <!--                AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
+            <!--            </if>-->
+            <if test="stopSellDay!=-2">
+                AND p.time_end BETWEEN #{stopSellTime} AND NOW()
+            </if>
+        </where>
+        <if test="orderItem!=''">
+            ORDER BY ${orderItem} ${orderSc}
+        </if>
+    </select>
 </mapper>