提交 945caa05 authored 作者: liuhaiquan's avatar liuhaiquan

修改发布货单时金额未进行元转分

上级 eed5b34d
package com.clx.order.params; package com.clx.order.params;
import com.msl.common.convertor.type.MoneyInConvert;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Getter @Getter
...@@ -13,6 +13,7 @@ import java.util.List; ...@@ -13,6 +13,7 @@ import java.util.List;
public class OrderGoodsChildParams { public class OrderGoodsChildParams {
@MoneyInConvert
@ApiModelProperty("挂单运费") @ApiModelProperty("挂单运费")
private BigDecimal pendingOrderFreight; private BigDecimal pendingOrderFreight;
......
package com.clx.order.params; package com.clx.order.params;
import com.msl.common.convertor.field.Converted;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -12,6 +13,6 @@ public class OrderGoodsParams { ...@@ -12,6 +13,6 @@ public class OrderGoodsParams {
@ApiModelProperty("订单编号") @ApiModelProperty("订单编号")
@NotBlank(message = "订单编号不能为空") @NotBlank(message = "订单编号不能为空")
private String orderNo; private String orderNo;
@Converted(isDynamic = true)
private List<OrderGoodsChildParams> orderGoodsChildParams; private List<OrderGoodsChildParams> orderGoodsChildParams;
} }
...@@ -73,6 +73,7 @@ public class GoodsOrderController { ...@@ -73,6 +73,7 @@ public class GoodsOrderController {
@ApiOperation(value = "提交货单", notes = "<br>By:胡宇帆") @ApiOperation(value = "提交货单", notes = "<br>By:胡宇帆")
@PostMapping("/saveGoodsOrder") @PostMapping("/saveGoodsOrder")
@UnitCovert(result = false)
public Result<Object> saveGoodName(@RequestBody @Validated OrderGoodsParams orderGoodsParams) { public Result<Object> saveGoodName(@RequestBody @Validated OrderGoodsParams orderGoodsParams) {
String orderNo = orderGoodsParams.getOrderNo(); String orderNo = orderGoodsParams.getOrderNo();
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
...@@ -133,7 +134,6 @@ public class GoodsOrderController { ...@@ -133,7 +134,6 @@ public class GoodsOrderController {
@ApiOperation(value = "创建货单-查看订单列表", notes = "<br>By:胡宇帆") @ApiOperation(value = "创建货单-查看订单列表", notes = "<br>By:胡宇帆")
@PostMapping("/pageCarrierOrderList") @PostMapping("/pageCarrierOrderList")
@UnitCovert(param = false)
public Result<PageData<FeignPageOrderVO>> pageCarrierOrderList(@RequestBody @Validated PageCarrierOrderListParam param) { public Result<PageData<FeignPageOrderVO>> pageCarrierOrderList(@RequestBody @Validated PageCarrierOrderListParam param) {
Result<PageData<FeignPageOrderVO>> dataResult = orderFeign.pageCarrierOrderList(JSONUtil.parse(param).toString()); Result<PageData<FeignPageOrderVO>> dataResult = orderFeign.pageCarrierOrderList(JSONUtil.parse(param).toString());
return dataResult; return dataResult;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论