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

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

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

@@ -42,24 +42,10 @@
                                         </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>
-                                <select name="paymentType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
+                                <select name="payType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -171,11 +157,11 @@
                     }
                 },
                 {
-                    field: 'paymentType',
-                    title: '支付方式'
-                    // formatter: function(value, row, index) {
-                    //     return $.table.selectDictLabel(payTypeDic, value);
-                    // }
+                    field: 'payType',
+                    title: '支付方式',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(payTypeDic, value);
+                    }
                 },
                 {
                     field: 'tied',

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.18.0.2:7001
+    host: 172.17.207.177:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-test.yml

@@ -15,10 +15,10 @@ liquidnet:
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level-root: debug
   rabbitmq:
     connection-timeout: 3000
   mysql:
     database-name: test_ln_scene
 
-#以下为spring各环境个性配置
+#以下为spring各环境个性配置
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -145,7 +145,7 @@ global-auth:
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/station/login
     - ${liquidnet.info.context}/station/login/sms
-#    -
+    #    -
     - ${liquidnet.info.context}/partner/buyNotice/**
     - ${liquidnet.info.context}/partner/checkUser/**
     - ${liquidnet.info.context}/partner/checkUser/performance/**

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

@@ -31,9 +31,12 @@ public class PerformanceRecommendAdminDao {
                 this.statusName="已下架";
                 break;
             case 8:
-                this.statusName="演出结束";
+                this.statusName="售罄";
                 break;
             case 9:
+                this.statusName="演出结束";
+                break;
+            case 10:
                 this.statusName="演出未开始";
                 break;
             default:

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

@@ -125,17 +125,13 @@
         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 kot.order_tickets_id = #{orderTicketsId}
-            </if>
             <if test="userId != null  and userId != ''">and kot.user_id = #{userId}</if>
             <if test="userName != null  and userName != ''">and kot.user_name like concat('%', #{userName}, '%')</if>
             <if test="userMobile != null  and userMobile != ''">and kot.user_mobile = #{userMobile}</if>
-            <if test="performanceTitle != null  and performanceTitle != ''">and kot.performance_title =
-                #{performanceTitle}
+            <if test="performanceTitle != null  and performanceTitle != ''">
+                and kot.performance_title like concat('%', #{performanceTitle}, '%')
             </if>
             <if test="orderCode != null  and orderCode != ''">and kot.order_code = #{orderCode}</if>
-            <if test="payCode != null  and payCode != ''">and kot.pay_code = #{payCode}</if>
-            <if test="qrCode != null  and qrCode != ''">and kot.qr_code = #{qrCode}</if>
             <if test="orderType != null  and orderType != ''">and kot.order_type = #{orderType}</if>
             <if test="orderVersion != null  and orderVersion != ''">and kot.order_version = #{orderVersion}</if>
             <if test="number != null ">and kot.number = #{number}</if>
@@ -168,6 +164,12 @@
             <if test="sponsor!=null and sponsor!=''">
                 AND kp.sponsor = #{sponsor}
             </if>
+            <if test="orderStatus!=null and orderStatus!=''">
+                AND kots.status = #{orderStatus}
+            </if>
+            <if test="sponsor!=null and sponsor!=''">
+                AND kp.sponsor = #{sponsor}
+            </if>
         </where>
         <!--        <if test="orderItem!=''">-->
         <!--            ORDER BY ${orderItem} ${orderSc}-->