快递

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

@@ -79,6 +79,7 @@ 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_STATUS1 = 1;    // 申请 顺丰返回失败
+    public static final Integer ORDER_EXPRESS_STATUS2 = 2;    // 申请 顺丰返回成功 或 通过主动再查询更新
+    public static final Integer ORDER_EXPRESS_STATUS3 = 3;    // 取消
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -31,13 +31,6 @@ public class PerformancesExpressController extends BaseController {
 
     private String prefix = "zhengzai/kylin/performancesExpress";
 
-    /*@Value("${liquidnet.shunfeng.url}")
-    public String url;
-    @Value("${liquidnet.shunfeng.sk}")
-    private String sk;
-    @Value("${liquidnet.shunfeng.appid}")
-    private String appid;*/
-
     @Autowired
     private PerformancesExpressServiceImpl performancesExpressServiceImpl;
 

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

@@ -126,7 +126,7 @@
                 },
                 {
                     field: '',
-                    title: '收获用户',
+                    title: '收货用户',
                     formatter: function(value, row, index) {
                         var expressContacts = row.expressContacts;
                         var expressAddress = row.expressAddress;

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -45,14 +45,13 @@ liquidnet:
       appid: ${liquidnet.client.admin.shunfeng.appid}
       custid: ${liquidnet.client.admin.shunfeng.custid}
       jCompany: 北京正在映画互联网有限公司
-      jContact: 姜秀龙
-      jMobile: 15811009011
+      jContact: 摩登天空票务部
+      jTel: 4001680650
       jProvince: 北京
       jCity: 北京市
       jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
-      payMethod: 0
-      expressType: 1
-      depositumInfo: 演出票
+      expressType: 1 # 默认顺丰特快
+      depositumInfo: 演出纸质票
 
 # 开发环境配置
 server: