记得上下班打卡 | git大法好,push需谨慎

Commit 433507c5 authored by jiangxiulong's avatar jiangxiulong

快递 去掉无用配置

parent 775befdd
...@@ -146,13 +146,13 @@ public class PerformancesExpressController extends BaseController { ...@@ -146,13 +146,13 @@ public class PerformancesExpressController extends BaseController {
} }
/** /**
* 实际运费主动查询 * 路由信息主动查询
*/ */
@RequiresPermissions("kylin:performancesExpress:getListFreight") @RequiresPermissions("kylin:performancesExpress:listOrderRoute")
@PostMapping("/getListFreight") @PostMapping("/listOrderRoute")
@ResponseBody @ResponseBody
public AjaxResult getListFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) { public AjaxResult listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
ResponseDto res = performancesExpressServiceImpl.getListFreight(performanceExpressSearchAdminParam); ResponseDto res = performancesExpressServiceImpl.listOrderRoute(performanceExpressSearchAdminParam);
try { try {
if (res.isSuccess()) { if (res.isSuccess()) {
return success(); return success();
...@@ -165,13 +165,13 @@ public class PerformancesExpressController extends BaseController { ...@@ -165,13 +165,13 @@ public class PerformancesExpressController extends BaseController {
} }
/** /**
* 路由信息主动查询 * 实际运费主动查询 暂时可先不用
*/ */
@RequiresPermissions("kylin:performancesExpress:listOrderRoute") @RequiresPermissions("kylin:performancesExpress:getListFreight")
@PostMapping("/listOrderRoute") @PostMapping("/getListFreight")
@ResponseBody @ResponseBody
public AjaxResult listOrderRoute(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) { public AjaxResult getListFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
ResponseDto res = performancesExpressServiceImpl.listOrderRoute(performanceExpressSearchAdminParam); ResponseDto res = performancesExpressServiceImpl.getListFreight(performanceExpressSearchAdminParam);
try { try {
if (res.isSuccess()) { if (res.isSuccess()) {
return success(); return success();
......
...@@ -20,17 +20,6 @@ liquidnet: ...@@ -20,17 +20,6 @@ liquidnet:
sslEnabled: false sslEnabled: false
database: dev_ln_scene database: dev_ln_scene
shunfeng: shunfeng:
url: ${liquidnet.client.admin.shunfeng.url}
sk: ${liquidnet.client.admin.shunfeng.sk} 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各环境个性配置 #以下为spring各环境个性配置
...@@ -20,17 +20,6 @@ liquidnet: ...@@ -20,17 +20,6 @@ liquidnet:
sslEnabled: false sslEnabled: false
database: test_ln_scene database: test_ln_scene
shunfeng: shunfeng:
url: ${liquidnet.client.admin.shunfeng.url}
sk: ${liquidnet.client.admin.shunfeng.sk} 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各环境个性配置 #以下为spring各环境个性配置
...@@ -33,10 +33,10 @@ public class PerformancesExpressCallbackController { ...@@ -33,10 +33,10 @@ public class PerformancesExpressCallbackController {
@Autowired @Autowired
private PerformancesExpressCallbackServiceImpl performancesExpressServiceImpl; private PerformancesExpressCallbackServiceImpl performancesExpressServiceImpl;
@PostMapping("orderStatus") @PostMapping("orderRoute")
@ApiOperation("订单状态推送") @ApiOperation("路由推送")
public HashMap OrderStatus(@RequestBody String performanceExpressPushStatusParam) { public HashMap listOrderRoute(@RequestBody String performanceExpressPushRouteParam) {
boolean result = performancesExpressServiceImpl.orderStatus(performanceExpressPushStatusParam); boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam);
HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
if (result) { if (result) {
objectObjectHashMap.put("status", "OK"); objectObjectHashMap.put("status", "OK");
...@@ -46,10 +46,10 @@ public class PerformancesExpressCallbackController { ...@@ -46,10 +46,10 @@ public class PerformancesExpressCallbackController {
return objectObjectHashMap; return objectObjectHashMap;
} }
@PostMapping("orderRoute") @PostMapping("orderStatus")
@ApiOperation("路由推送") @ApiOperation("订单状态推送") // 暂时业务不需要
public HashMap listOrderRoute(@RequestBody String performanceExpressPushRouteParam) { public HashMap OrderStatus(@RequestBody String performanceExpressPushStatusParam) {
boolean result = performancesExpressServiceImpl.orderRoute(performanceExpressPushRouteParam); boolean result = performancesExpressServiceImpl.orderStatus(performanceExpressPushStatusParam);
HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
if (result) { if (result) {
objectObjectHashMap.put("status", "OK"); objectObjectHashMap.put("status", "OK");
...@@ -60,7 +60,7 @@ public class PerformancesExpressCallbackController { ...@@ -60,7 +60,7 @@ public class PerformancesExpressCallbackController {
} }
@PostMapping("orderFreightList") @PostMapping("orderFreightList")
@ApiOperation("清单运费推送") @ApiOperation("清单运费推送") // 暂时业务不需要
public HashMap getListFreight(@RequestBody String performanceExpressPushFreightParam) { public HashMap getListFreight(@RequestBody String performanceExpressPushFreightParam) {
boolean result = performancesExpressServiceImpl.orderFreightList(performanceExpressPushFreightParam); boolean result = performancesExpressServiceImpl.orderFreightList(performanceExpressPushFreightParam);
HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
...@@ -73,7 +73,7 @@ public class PerformancesExpressCallbackController { ...@@ -73,7 +73,7 @@ public class PerformancesExpressCallbackController {
} }
@GetMapping("orderRoute/{orderTicketsId}") @GetMapping("orderRoute/{orderTicketsId}")
@ApiOperation("获取物流信息") @ApiOperation("获取物流信息") // 前端使用
@ApiImplicitParam(name = "orderTicketsId", value = "订单ID", required = true, dataType = "String", paramType = "path") @ApiImplicitParam(name = "orderTicketsId", value = "订单ID", required = true, dataType = "String", paramType = "path")
public ResponseDto<List<KylinOrderExpressRouteVo>> orderRouteDetail(@PathVariable() String orderTicketsId) { public ResponseDto<List<KylinOrderExpressRouteVo>> orderRouteDetail(@PathVariable() String orderTicketsId) {
List<KylinOrderExpressRouteVo> routeVoList = performancesExpressServiceImpl.orderRouteDetail(orderTicketsId); List<KylinOrderExpressRouteVo> routeVoList = performancesExpressServiceImpl.orderRouteDetail(orderTicketsId);
......
...@@ -37,25 +37,6 @@ import java.util.List; ...@@ -37,25 +37,6 @@ import java.util.List;
@Slf4j @Slf4j
public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrderExpressMapper, KylinOrderExpress> implements IKylinOrderExpress { 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 @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment