Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

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

@@ -31,6 +31,9 @@ public class PerformanceExpressSearchAdminParam {
 
     private String mailno;
 
+    private String productCode;
+    private String expressType;
+
     private List<String> ids;
 
 }

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

@@ -24,8 +24,8 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
     // 1寄付|2到付|3包邮
     Integer expressType;
     // 标快 特快
-    Integer produceCode;
-    Integer produceTitle;
+    Integer productCode;
+    Integer productTitle;
 
     String orderExpressId;
     String mailno;

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

@@ -305,9 +305,9 @@
 
         kots.status,
         kots.express_type,
-        kots.produce_code,
+        kots.product_code,
 
-        kem.title as produce_title,
+        kem.title as product_title,
 
         oe.order_express_id,
         oe.mailno,
@@ -350,7 +350,7 @@
             <if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
             <if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId}</if>
             <if test="expressType != '' and expressType != null">AND kots.express_type = ${expressType}</if>
-            <if test="produceCode != '' and produceCode != null">AND kots.produce_code = ${produceCode}</if>
+            <if test="productCode != '' and productCode != null">AND kots.produce_code = ${productCode}</if>
         </where>
         ORDER BY kot.mid DESC
     </select>