整理顺丰配置

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

@@ -51,23 +51,23 @@ import java.util.stream.Collectors;
 @Slf4j
 public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpressMapper, KylinOrderExpress> implements IKylinOrderExpress {
 
-    @Value("${liquidnet.shunfeng.custid}")
+    @Value("${liquidnet.express.shunfeng.custid}")
     private String custid;
-    @Value("${liquidnet.shunfeng.jCompany}")
+    @Value("${liquidnet.express.shunfeng.jCompany}")
     private String jCompany;
-    @Value("${liquidnet.shunfeng.jContact}")
+    @Value("${liquidnet.express.shunfeng.jContact}")
     private String jContact;
-    @Value("${liquidnet.shunfeng.jTel}")
+    @Value("${liquidnet.express.shunfeng.jTel}")
     private String jTel;
-    @Value("${liquidnet.shunfeng.jProvince}")
+    @Value("${liquidnet.express.shunfeng.jProvince}")
     private String jProvince;
-    @Value("${liquidnet.shunfeng.jCity}")
+    @Value("${liquidnet.express.shunfeng.jCity}")
     private String jCity;
-    @Value("${liquidnet.shunfeng.jAddress}")
+    @Value("${liquidnet.express.shunfeng.jAddress}")
     private String jAddress;
-    @Value("${liquidnet.shunfeng.expressType}")
+    @Value("${liquidnet.express.shunfeng.expressType}")
     private Integer expressType;
-    @Value("${liquidnet.shunfeng.depositumInfo}")
+    @Value("${liquidnet.express.shunfeng.depositumInfo}")
     private String depositumInfo;
 
     @Autowired

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/ShunfengSignUtils.java

@@ -34,17 +34,17 @@ public class ShunfengSignUtils {
     /**
      * appId
      */
-    @Value("${liquidnet.shunfeng.appid}")
+    @Value("${liquidnet.express.shunfeng.appid}")
     private String APP_ID;
     /**
      * sk
      */
-    @Value("${liquidnet.shunfeng.sk}")
+    @Value("${liquidnet.express.shunfeng.sk}")
     private String SK;
     /**
      * url
      */
-    @Value("${liquidnet.shunfeng.url}")
+    @Value("${liquidnet.express.shunfeng.url}")
     private String URL;
     /**
      * 签名有效期（可根据实际业务设定）单位：毫秒

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -85,11 +85,6 @@ liquidnet:
       phpMallUrl: https://devmall.zhengzai.tv
       platformUrl: https://devplatform.zhengzai.tv
       h5Url: https://devm.zhengzai.tv
-      shunfeng:
-        url: "https://butler-dev.sit.sf-express.com"
-        sk: 21e9a70f677a2bf29dfa2b3bead4f018
-        appid: 557104628450889728
-        custid: 7551234567
   aliyun:
     dypns:
       accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -87,11 +87,6 @@ liquidnet:
       phpMallUrl: https://testmall.zhengzai.tv
       platformUrl: https://testplatform.zhengzai.tv
       h5Url: https://testm.zhengzai.tv
-      shunfeng:
-        url: "https://butler-dev.sit.sf-express.com"
-        sk: 21e9a70f677a2bf29dfa2b3bead4f018
-        appid: 557104628450889728
-        custid: 7551234567
   aliyun:
     dypns:
       accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn

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

@@ -26,19 +26,6 @@ liquidnet:
     al-oss:
       imgUrl: "https://img.zhengzai.tv/"
       appUrl: "https://app.zhengzai.tv/"
-    shunfeng:
-      url: ${liquidnet.client.admin.shunfeng.url}
-      sk: ${liquidnet.client.admin.shunfeng.sk}
-      appid: ${liquidnet.client.admin.shunfeng.appid}
-      custid: ${liquidnet.client.admin.shunfeng.custid}
-      jCompany: 北京正在映画互联网有限公司
-      jContact: 摩登天空票务部
-      jTel: 4001680650
-      jProvince: 北京
-      jCity: 北京市
-      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
-      expressType: 1 # 默认顺丰特快
-      depositumInfo: 演出纸质票
 
 # 开发环境配置
 server:

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-dev.yml

@@ -19,8 +19,6 @@ liquidnet:
   mongodb:
     sslEnabled: false
     database: dev_ln_scene
-  shunfeng:
-    sk: ${liquidnet.client.admin.shunfeng.sk}
   al-oss:
     imgUrl: "https://img.zhengzai.tv/"
     appUrl: "https://app.zhengzai.tv/"

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

@@ -19,8 +19,6 @@ liquidnet:
   mongodb:
     sslEnabled: false
     database: test_ln_scene
-  shunfeng:
-    sk: ${liquidnet.client.admin.shunfeng.sk}
   al-oss:
     imgUrl: "https://img.zhengzai.tv/"
     appUrl: "https://app.zhengzai.tv/"

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -23,7 +23,6 @@ import org.apache.commons.lang.StringUtils;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -55,18 +54,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     private MongoTemplate mongoTemplate;
     @Autowired
     private QueueUtils queueUtils;
-    @Autowired
-    private KylinRefundsStatusServiceImpl refundsStatusService;
-
-    @Value("${liquidnet.express.shunfeng.custid}")
-    private String custid;
-    @Value("${liquidnet.express.shunfeng.expressType}")
-    private Integer expressType;
-    @Value("${liquidnet.express.shunfeng.depositumInfo}")
-    private String depositumInfo;
-
-    @Autowired
-    private ShunfengSignUtils shunfengSignUtils;
 
     @Override
     public PageInfo<List<KylinOrderListVo>> orderList() {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ShunfengSignUtils.java

@@ -23,7 +23,7 @@ public class ShunfengSignUtils {
     /**
      * sk
      */
-    @Value("${liquidnet.shunfeng.sk}")
+    @Value("${liquidnet.express.shunfeng.sk}")
     private String SK;
     /**
      * 签名有效期（可根据实际业务设定）单位：毫秒