快递 去掉无用配置

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

@@ -146,13 +146,13 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 实际运费主动查询
+     * 路由信息主动查询
      */
-    @RequiresPermissions("kylin:performancesExpress:getListFreight")
-    @PostMapping("/getListFreight")
+    @RequiresPermissions("kylin:performancesExpress:listOrderRoute")
+    @PostMapping("/listOrderRoute")
     @ResponseBody
-    public AjaxResult getListFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        ResponseDto res = performancesExpressServiceImpl.getListFreight(performanceExpressSearchAdminParam);
+    public AjaxResult listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.listOrderRoute(performanceExpressSearchAdminParam);
         try {
             if (res.isSuccess()) {
                 return success();
@@ -165,13 +165,13 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 路由信息主动查询
+     * 实际运费主动查询 暂时可先不用
      */
-    @RequiresPermissions("kylin:performancesExpress:listOrderRoute")
-    @PostMapping("/listOrderRoute")
+    @RequiresPermissions("kylin:performancesExpress:getListFreight")
+    @PostMapping("/getListFreight")
     @ResponseBody
-    public AjaxResult listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        ResponseDto res = performancesExpressServiceImpl.listOrderRoute(performanceExpressSearchAdminParam);
+    public AjaxResult getListFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getListFreight(performanceExpressSearchAdminParam);
         try {
             if (res.isSuccess()) {
                 return success();

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

@@ -20,17 +20,6 @@ liquidnet:
     sslEnabled: false
     database: dev_ln_scene
   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: 演出纸质票
 
 #以下为spring各环境个性配置

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

@@ -20,17 +20,6 @@ liquidnet:
     sslEnabled: false
     database: test_ln_scene
   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: 演出纸质票
 
 #以下为spring各环境个性配置

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/express/shunfeng/PerformancesExpressCallbackController.java

@@ -33,10 +33,10 @@ public class PerformancesExpressCallbackController {
     @Autowired
     private PerformancesExpressCallbackServiceImpl performancesExpressServiceImpl;
 
-    @PostMapping("orderStatus")
-    @ApiOperation("订单状态推送")
-    public HashMap OrderStatus(@RequestBody String performanceExpressPushStatusParam) {
-        boolean result = performancesExpressServiceImpl.orderStatus(performanceExpressPushStatusParam);
+    @PostMapping("orderRoute")
+    @ApiOperation("路由推送")
+    public HashMap listOrderRoute(@RequestBody String performanceExpressPushRouteParam) {
+        boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         if (result) {
             objectObjectHashMap.put("status", "OK");
@@ -46,10 +46,10 @@ public class PerformancesExpressCallbackController {
         return objectObjectHashMap;
     }
 
-    @PostMapping("orderRoute")
-    @ApiOperation("路由推送")
-    public HashMap listOrderRoute(@RequestBody String performanceExpressPushRouteParam) {
-        boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam);
+    @PostMapping("orderStatus")
+    @ApiOperation("订单状态推送") // 暂时业务不需要
+    public HashMap OrderStatus(@RequestBody String performanceExpressPushStatusParam) {
+        boolean result = performancesExpressServiceImpl.orderStatus(performanceExpressPushStatusParam);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         if (result) {
             objectObjectHashMap.put("status", "OK");
@@ -60,7 +60,7 @@ public class PerformancesExpressCallbackController {
     }
 
     @PostMapping("orderFreightList")
-    @ApiOperation("清单运费推送")
+    @ApiOperation("清单运费推送") // 暂时业务不需要
     public HashMap getListFreight(@RequestBody String performanceExpressPushFreightParam) {
         boolean result = performancesExpressServiceImpl.orderFreightList(performanceExpressPushFreightParam);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
@@ -73,7 +73,7 @@ public class PerformancesExpressCallbackController {
     }
 
     @GetMapping("orderRoute/{orderTicketsId}")
-    @ApiOperation("获取物流信息")
+    @ApiOperation("获取物流信息") // 前端使用
     @ApiImplicitParam(name = "orderTicketsId", value = "订单ID", required = true, dataType = "String", paramType = "path")
     public ResponseDto<List<KylinOrderExpressRouteVo>> orderRouteDetail(@PathVariable() String orderTicketsId) {
         List<KylinOrderExpressRouteVo> routeVoList = performancesExpressServiceImpl.orderRouteDetail(orderTicketsId);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java

@@ -37,25 +37,6 @@ import java.util.List;
 @Slf4j
 public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrderExpressMapper, KylinOrderExpress> implements IKylinOrderExpress {
 
-    @Value("${liquidnet.shunfeng.custid}")
-    private String custid;
-    @Value("${liquidnet.shunfeng.jCompany}")
-    private String jCompany;
-    @Value("${liquidnet.shunfeng.jContact}")
-    private String jContact;
-    @Value("${liquidnet.shunfeng.jTel}")
-    private String jTel;
-    @Value("${liquidnet.shunfeng.jProvince}")
-    private String jProvince;
-    @Value("${liquidnet.shunfeng.jCity}")
-    private String jCity;
-    @Value("${liquidnet.shunfeng.jAddress}")
-    private String jAddress;
-    @Value("${liquidnet.shunfeng.expressType}")
-    private Integer expressType;
-    @Value("${liquidnet.shunfeng.depositumInfo}")
-    private String depositumInfo;
-
     @Autowired
     MongoTemplate mongoTemplate;