Merge branch 'pre' into 'master'

Pre

See merge request !92

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java

@@ -83,4 +83,6 @@ public class KylinTableStatusConst {
     public static final Integer ORDER_EXPRESS_STATUS3 = 3;    // 取消
     public static final Integer ORDER_EXPRESS_STATUS80 = 80;    // 签收
     public static final Integer ORDER_EXPRESS_STATUS8000 = 8000;    // 签收结单
+    public static final Integer ORDER_EXPRESS_SEND_TYPE1 = 1;    // 发货
+    public static final Integer ORDER_EXPRESS_SEND_TYPE2 = 2;    // 退款
 }

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

@@ -128,6 +128,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                             Wrappers.lambdaQuery(KylinOrderExpress.class)
                                     .ne(KylinOrderExpress::getExpressStatus, 1).ne(KylinOrderExpress::getExpressStatus, 3)
                                     .eq(KylinOrderExpress::getPerformancesId, info.getPerformancesId())
+                                    .eq(KylinOrderExpress::getSendType, KylinTableStatusConst.ORDER_EXPRESS_SEND_TYPE1)
                     );
                     // 运输中
                     Integer total2 = kylinOrderExpressMapper.selectCount(
@@ -135,12 +136,14 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                                     .ne(KylinOrderExpress::getExpressStatus, KylinTableStatusConst.ORDER_EXPRESS_STATUS80)
                                     .ne(KylinOrderExpress::getExpressStatus, KylinTableStatusConst.ORDER_EXPRESS_STATUS8000)
                                     .eq(KylinOrderExpress::getPerformancesId, info.getPerformancesId())
+                                    .eq(KylinOrderExpress::getSendType, KylinTableStatusConst.ORDER_EXPRESS_SEND_TYPE1)
                     );
                     // 已签收
                     Integer[] statusList = new Integer[]{KylinTableStatusConst.ORDER_EXPRESS_STATUS80, KylinTableStatusConst.ORDER_EXPRESS_STATUS8000};
                     Integer total3 = kylinOrderExpressMapper.selectCount(
                             Wrappers.lambdaQuery(KylinOrderExpress.class).in(KylinOrderExpress::getExpressStatus, statusList)
                                     .eq(KylinOrderExpress::getPerformancesId, info.getPerformancesId())
+                                    .eq(KylinOrderExpress::getSendType, KylinTableStatusConst.ORDER_EXPRESS_SEND_TYPE1)
                     );
                     info.setTotal1(total1);
                     info.setTotal2(total2);
@@ -204,6 +207,9 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             kylinOrderExpressPre.setExpressType(expressType);
             kylinOrderExpressPre.setCreatedAt(DateUtil.getNowTime());
             kylinOrderExpressPre.setPerformancesId(Relations.getPerformanceId());
+            kylinOrderExpressPre.setExpressContacts(orderInfo.getExpressContacts());
+            kylinOrderExpressPre.setExpressPhone(orderInfo.getExpressPhone());
+            kylinOrderExpressPre.setSendExpressAddress(orderInfo.getExpressAddress());
             kylinOrderExpressMapper.insert(kylinOrderExpressPre);
 
             // 请求下单数据

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

@@ -13,7 +13,8 @@
         LEFT JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         LEFT JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>
-            a.order_express_id IN
+            a.send_type = 1
+            AND a.order_express_id IN
             <foreach collection="ids" item="orderExpressId" index="index" open="(" close=")" separator=",">
                 ${orderExpressId}
             </foreach>
@@ -32,7 +33,8 @@
         LEFT JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         LEFT JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>
-            a.express_status = 2
+            a.send_type = 1
+            AND a.express_status = 2
             AND a.performances_id = #{performanceId}
             <if test="ticketId != ''">AND e.tickets_id = #{ticketId}</if>
             AND a.mid > ${mid}
@@ -46,6 +48,7 @@
         FROM kylin_order_express
         <where>
             performances_id = #{performanceId}
+            AND send_type = 1
             AND express_status = 2 -- 只能取消申请成功的 揽收以后不支持取消
             AND mid > ${mid}
         </where>