提交 cce5147c authored 作者: huyufan's avatar huyufan

测试取消订单

上级 99c8ae9e
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
<groupId>com.msl</groupId> <groupId>com.msl</groupId>
<artifactId>convertor-spring-boot-starter</artifactId> <artifactId>convertor-spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.clx.cy</groupId>
<artifactId>open-sdk</artifactId>
</dependency>
</dependencies> </dependencies>
......
package com.clx.performance.feign; package com.clx.performance.feign;
import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
import com.clx.performance.param.pc.OrderCancelParam; import com.clx.performance.param.pc.OrderCancelParam;
import com.msl.common.result.Result; import com.msl.common.result.Result;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
...@@ -17,6 +18,6 @@ public interface PerformanceSDKFeign { ...@@ -17,6 +18,6 @@ public interface PerformanceSDKFeign {
@GetMapping(value = {"clx-performance/feign/sdk/orderCancelResidueWeight"}) @GetMapping(value = {"clx-performance/feign/sdk/orderCancelResidueWeight"})
Result<String> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType); Result<OwnerCancelResidueWeightDTO> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType);
} }
...@@ -51,11 +51,6 @@ ...@@ -51,11 +51,6 @@
<artifactId>message-api</artifactId> <artifactId>message-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.clx.cy</groupId>
<artifactId>open-sdk</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.msl</groupId> <groupId>com.msl</groupId>
<artifactId>user-sdk</artifactId> <artifactId>user-sdk</artifactId>
......
package com.clx.performance.controller.feign; package com.clx.performance.controller.feign;
import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
import com.clx.performance.param.pc.OrderCancelParam; import com.clx.performance.param.pc.OrderCancelParam;
import com.msl.common.result.Result; import com.msl.common.result.Result;
import com.msl.user.utils.TokenUtil; import com.msl.user.utils.TokenUtil;
...@@ -24,7 +25,7 @@ public class PerformanceSdkFeignController { ...@@ -24,7 +25,7 @@ public class PerformanceSdkFeignController {
@ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆") @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
@PostMapping("/ownCancelOrderPre") @PostMapping("/ownCancelOrderPre")
public Result<String> ownCancelOrderPre(@RequestBody OrderCancelParam param) { public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
log.info("取消订单参数:{}", TokenUtil.getLoginUserInfo()); log.info("取消订单参数:{}", TokenUtil.getLoginUserInfo());
//orderCancelService.ownerCancelOrderPre(param); //orderCancelService.ownerCancelOrderPre(param);
return Result.ok(); return Result.ok();
...@@ -32,9 +33,11 @@ public class PerformanceSdkFeignController { ...@@ -32,9 +33,11 @@ public class PerformanceSdkFeignController {
@ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆") @ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆")
@GetMapping("/orderCancelResidueWeight") @GetMapping("/orderCancelResidueWeight")
public Result<String> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) { public Result<OwnerCancelResidueWeightDTO> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
log.info("当前订单可取消吨数参数:{}", TokenUtil.getLoginUserInfo()); log.info("当前订单可取消吨数参数:{}", TokenUtil.getLoginUserInfo());
//orderGoodsService.orderCancelResidueWeight(orderNo,optionType); //orderGoodsService.orderCancelResidueWeight(orderNo,optionType);
return Result.ok(new BigDecimal(100).toString()); OwnerCancelResidueWeightDTO dto = new OwnerCancelResidueWeightDTO();
dto.setWeight(new BigDecimal("100").toString());
return Result.ok(dto);
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论