Merge branch 'jxl_1018_expressStatus' into pre

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

@@ -81,4 +81,6 @@ public class KylinTableStatusConst {
     public static final Integer ORDER_EXPRESS_STATUS1 = 1;    // 申请 顺丰返回失败 未下单 未发快递
     public static final Integer ORDER_EXPRESS_STATUS2 = 2;    // 申请 顺丰返回成功 或 通过主动再查询更新
     public static final Integer ORDER_EXPRESS_STATUS3 = 3;    // 取消
+    public static final Integer ORDER_EXPRESS_STATUS80 = 80;    // 签收
+    public static final Integer ORDER_EXPRESS_STATUS8000 = 8000;    // 签收结单
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -459,6 +459,9 @@
                                 case 80:
                                     expressStatusName = '已签收';
                                     break;
+                                case 8000:
+                                    expressStatusName = '已签收';
+                                    break;
                                 default:
                                     expressStatusName = '运输中';
                                     break;

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

@@ -132,12 +132,14 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     // 运输中
                     Integer total2 = kylinOrderExpressMapper.selectCount(
                             Wrappers.lambdaQuery(KylinOrderExpress.class).gt(KylinOrderExpress::getExpressStatus, 3)
-                                    .ne(KylinOrderExpress::getExpressStatus, 80)
+                                    .ne(KylinOrderExpress::getExpressStatus, KylinTableStatusConst.ORDER_EXPRESS_STATUS80)
+                                    .ne(KylinOrderExpress::getExpressStatus, KylinTableStatusConst.ORDER_EXPRESS_STATUS8000)
                                     .eq(KylinOrderExpress::getPerformancesId, info.getPerformancesId())
                     );
                     // 已签收
+                    Integer[] statusList = new Integer[]{KylinTableStatusConst.ORDER_EXPRESS_STATUS80, KylinTableStatusConst.ORDER_EXPRESS_STATUS8000};
                     Integer total3 = kylinOrderExpressMapper.selectCount(
-                            Wrappers.lambdaQuery(KylinOrderExpress.class).eq(KylinOrderExpress::getExpressStatus, 80)
+                            Wrappers.lambdaQuery(KylinOrderExpress.class).in(KylinOrderExpress::getExpressStatus, statusList)
                                     .eq(KylinOrderExpress::getPerformancesId, info.getPerformancesId())
                     );
                     info.setTotal1(total1);

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

@@ -339,7 +339,8 @@
                 ${expressStatus}
             </if>
             <if test="expressStatus == 1">AND (oe.express_status IS NULL OR oe.express_status = ${expressStatus})</if>
-            <if test="expressStatus == 70">AND (oe.express_status > 3 AND oe.express_status != 80)</if>
+            <if test="expressStatus == 70">AND (oe.express_status > 3 AND oe.express_status != 80 AND oe.express_status != 8000)</if>
+            <if test="expressStatus == 80">AND (oe.express_status = 80 OR oe.express_status = 8000)</if>
             <if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
 
         </where>