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

@@ -19,6 +19,7 @@ public class OrderListReq {
     private String timePayStart;
     private String timePayEnd;
     private String sponsorId;
+    private String sponsor;
     private String paymentType;
     private String orderStatus;
     private String orderSource;

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

@@ -175,4 +175,6 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
     KylinPerformanceDamaiVo getPerformanceDamai(String performancesId);
 
     List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
+
+    List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType);
 }

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.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
+import com.liquidnet.service.kylin.dao.PerformanceSponsorDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
+import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -29,6 +32,9 @@ public class KylinOrderTicketsController extends BaseController
     @Autowired
     private IKylinOrderTicketsAdminService iKylinOrderTicketsAdminService;
 
+    @Autowired
+    private IKylinPerformancesAdminService kylinPerformancesService;
+
     @RequiresPermissions("kylin:order:orderlist:view")
     @GetMapping("/orderList")
     public String tickets()
@@ -60,4 +66,17 @@ public class KylinOrderTicketsController extends BaseController
         return prefix + "/orderList/details";
     }
 
+    /**
+     * 获取第三方列表
+     */
+    @GetMapping("/orderList/getSponsorList")
+    @ResponseBody
+    public AjaxResult getSponsorList() {
+        List<PerformanceSponsorDao> performanceSponsorList = kylinPerformancesService.getPerformanceSponsorList(null);
+        AjaxResult ajax = new AjaxResult();
+
+        ajax.put("code", 200);
+        ajax.put("value", performanceSponsorList);
+        return ajax;
+    }
 }

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

@@ -30,10 +30,32 @@
                             </li>
                             <li>
                                 <label>第三方：</label>
-                                <select name="sponsorId">
-                                    <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
-                                </select>
+                                <div class="col-lg-3">
+                                    <div class="input-group">
+                                        <input type="text" class="form-control" id="sponsorSelectDiv" name="sponsor">
+                                        <div class="input-group-btn">
+                                            <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
+                                                <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </div>
+<!--                                <div class="input-group">-->
+<!--                                    <input type="text" class="form-control" id="sponsorSelectDiv">-->
+<!--                                    <div class="input-group-btn">-->
+<!--                                        <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">-->
+<!--                                            <span class="caret"></span>-->
+<!--                                        </button>-->
+<!--                                        <ul class="dropdown-menu dropdown-menu-right" role="menu">-->
+<!--                                        </ul>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <select name="sponsorId">-->
+<!--                                    <option value="">所有</option>-->
+<!--                                    <option value="-1">代码生成请选择字典属性</option>-->
+<!--                                </select>-->
                             </li>
                             <li>
                                 <label>支付方式：</label>
@@ -104,6 +126,8 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: bootstrap-suggest-js" />
+     <th:block th:include="include :: bootstrap-typeahead-js" />
     <script th:inline="javascript">
         var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
         var prefix = ctx + "kylin/order/orderList";
@@ -121,7 +145,7 @@
                     checkbox: true
                 },
                 {
-                    field: '-',
+                    field: 'sponsor',
                     title: '第三方'
                 },
                 {
@@ -193,6 +217,18 @@
             };
             $.table.init(options);
         });
+
+        var sponsorSelectDiv = $("#sponsorSelectDiv").bsSuggest({
+            url: prefix + "/getSponsorList",
+            idField: "sponsorId",
+            keyField: "sponsorName"
+        }).on('onDataRequestSuccess', function (e, result) {
+            console.log('onDataRequestSuccess: ', result);
+        }).on('onSetSelectValue', function (e, keyword) {
+            console.log('onSetSelectValue: ', keyword);
+        }).on('onUnsetSelectValue', function (e) {
+            console.log("onUnsetSelectValue");
+        });
     </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/KylinPerformancesAdminServiceImpl.java

@@ -11,8 +11,6 @@ import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
@@ -605,4 +603,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         dtoList.add(countBean);
         return dtoList;
     }
+
+    @Override
+    public List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType) {
+        return performancesMapper.getPerformanceSponsorList(sponsorType);
+    }
 }

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

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PerformanceSponsorDao
+ * @Package com.liquidnet.service.kylin.dao
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/19 14:49
+ */
+@Data
+public class PerformanceSponsorDao {
+    private String sponsorId;
+    private String sponsorName;
+    private String sponsorType;
+}

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

@@ -43,4 +43,6 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
     PerformanceRecommendDao getRecommend(String performancesId);
 
     List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
+
+    List<PerformanceSponsorDao> getPerformanceSponsorList(String sponsorType);
 }

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

@@ -110,6 +110,11 @@
         <result column="total_paying_number" property="totalPayingNumber"/>
         <result column="total_buy_users" property="totalBuyUsers"/>
     </resultMap>
+    <resultMap id="performanceSponsorDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceSponsorDao">
+        <result column="sponsor_id" property="sponsorId"/>
+        <result column="sponsor" property="sponsorName"/>
+        <result column="sponsor_type" property="sponsorType"/>
+    </resultMap>
 
     <!-- 第三方演出列表 (不包含退票信息) -->
     <select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
@@ -412,37 +417,37 @@
     </select>
     <select id="orderList" resultMap="performanceOrderListDaoResult">
         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
+        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
+        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="performanceTitle != null  and performanceTitle != ''"> and performance_title LIKE concat('%', #{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>
@@ -471,32 +476,23 @@
             <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 test="sponsor!=null and sponsor!=''">
+                AND kp.sponsor = #{sponsor}
             </if>
         </where>
         <if test="orderItem!=''">
             ORDER BY ${orderItem} ${orderSc}
         </if>
     </select>
+    <select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">
+        select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type
+        from kylin_performances kp
+        <where>
+            kp.sponsor_id != ''
+            <if test="sponsorType!=null and sponsorType!=''">
+                AND kp.sponsor_type = #{sponsorType}
+            </if>
+        </where>
+        order by sponsor_id
+    </select>
 </mapper>