提交 9048529b authored 作者: aiqingguo's avatar aiqingguo

Merge branch 'v6.5_transport_open_20231115' into test

Former-commit-id: 4a152be9
...@@ -6,6 +6,7 @@ import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam; ...@@ -6,6 +6,7 @@ import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
import com.clx.performance.config.MslPaymentConfig; import com.clx.performance.config.MslPaymentConfig;
import com.clx.performance.feign.TransportFeignService; import com.clx.performance.feign.TransportFeignService;
import com.clx.performance.param.feign.transport.OrderChildPaySyncParam; import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
import com.clx.performance.param.feign.transport.OwnerSettlementSyncParam;
import com.clx.performance.service.TempService; import com.clx.performance.service.TempService;
import com.clx.performance.service.child.FeignOrderChildService; import com.clx.performance.service.child.FeignOrderChildService;
import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO; import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
...@@ -92,7 +93,7 @@ public class TempController { ...@@ -92,7 +93,7 @@ public class TempController {
// return Result.ok(); // return Result.ok();
// } // }
@ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国") @ApiOperation(value = "运单支付运费同步 (临时接口)", notes = "<br>By:艾庆国")
@RequestMapping(value = "/orderChildPaySync", method = RequestMethod.POST) @RequestMapping(value = "/orderChildPaySync", method = RequestMethod.POST)
public Result<Void> orderChildPaySync(@RequestBody OrderChildPaySyncParam param) { public Result<Void> orderChildPaySync(@RequestBody OrderChildPaySyncParam param) {
...@@ -102,4 +103,14 @@ public class TempController { ...@@ -102,4 +103,14 @@ public class TempController {
return Result.ok(); return Result.ok();
} }
@ApiOperation(value = "货主结算单同步 (临时接口)", notes = "<br>By:艾庆国")
@RequestMapping(value = "/ownerSettlementSync", method = RequestMethod.POST)
public Result<Void> ownerSettlementSync(@RequestBody OwnerSettlementSyncParam param) {
HttpDTO httpDTO = transportFeignService.ownerSettlementSync(param);
String decrypt = ThirdComponent.decrypt(httpDTO.getData());
log.info("{}", decrypt);
return Result.ok();
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论