|
@@ -34,7 +34,7 @@ public class JstOrderSyncController {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 接收聚水潭erp回调
|
|
|
|
|
|
|
+ * 聚水潭erp物流回调接口
|
|
|
* URL: POST /open/callback?partnerid=erp&method=logistics.upload&ts=xxx&sign=xxx
|
|
* URL: POST /open/callback?partnerid=erp&method=logistics.upload&ts=xxx&sign=xxx
|
|
|
*/
|
|
*/
|
|
|
@PostMapping("/open/callback")
|
|
@PostMapping("/open/callback")
|
|
@@ -66,15 +66,15 @@ public class JstOrderSyncController {
|
|
|
|
|
|
|
|
// 4. 处理业务
|
|
// 4. 处理业务
|
|
|
try {
|
|
try {
|
|
|
- jstErpHttpService.processLogisticsPush(request);
|
|
|
|
|
|
|
+ jstErpHttpService.jSTanErpLogisticsCallback(request);
|
|
|
return ResponseEntity.ok(new PushResponse("0", "执行成功"));
|
|
return ResponseEntity.ok(new PushResponse("0", "执行成功"));
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
- log.error("处理聚水潭物流推送异常", e);
|
|
|
|
|
|
|
+ log.error("处理聚水潭物流回调异常", e);
|
|
|
return ResponseEntity.ok(new PushResponse("1", "system error"));
|
|
return ResponseEntity.ok(new PushResponse("1", "system error"));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 模拟订单推送到兔灵erp接口
|
|
|
|
|
|
|
+ // 模拟兔灵erp订单同步(推送)
|
|
|
@PostMapping("/create")
|
|
@PostMapping("/create")
|
|
|
public Object syncOrderToJst(){
|
|
public Object syncOrderToJst(){
|
|
|
TlCreateOrderRequest request=fillRequest();
|
|
TlCreateOrderRequest request=fillRequest();
|