|
@@ -14,51 +14,50 @@ import lombok.Data;
|
|
|
*/
|
|
|
@Data
|
|
|
@ApiModel("用户提货订单项VO")
|
|
|
-public class UserDeliverOrderItemVO extends UserDeliverOrderItem {
|
|
|
+public class UserDeliverOrderItemVO extends UserDeliverOrderItem {
|
|
|
|
|
|
- @ApiModelProperty("商品编号")
|
|
|
- private String goodsCode;
|
|
|
+ @ApiModelProperty("商品编号")
|
|
|
+ private String goodsCode;
|
|
|
|
|
|
- @ApiModelProperty("sku编号")
|
|
|
- private String skuCode;
|
|
|
+ @ApiModelProperty("sku编号")
|
|
|
+ private String skuCode;
|
|
|
|
|
|
- @ApiModelProperty("金额")
|
|
|
- private Integer price;
|
|
|
+ @ApiModelProperty("金额")
|
|
|
+ private Integer price;
|
|
|
|
|
|
- @JSONField(serialize = false)
|
|
|
- @ApiModelProperty("商品价值")
|
|
|
- private Integer goodsValue;
|
|
|
+ @JSONField(serialize = false)
|
|
|
+ @ApiModelProperty("商品价值")
|
|
|
+ private Integer goodsValue;
|
|
|
|
|
|
- @ApiModelProperty("商品成本")
|
|
|
- private Integer goodsCost;
|
|
|
+ @ApiModelProperty("商品成本")
|
|
|
+ private Integer goodsCost;
|
|
|
|
|
|
- @JSONField(serialize = false)
|
|
|
- @ApiModelProperty("sku价值")
|
|
|
- private Integer skuValue;
|
|
|
+ @JSONField(serialize = false)
|
|
|
+ @ApiModelProperty("sku价值")
|
|
|
+ private Integer skuValue;
|
|
|
|
|
|
- @ApiModelProperty("供应商名称")
|
|
|
- private String supplierName;
|
|
|
+ @ApiModelProperty("供应商名称")
|
|
|
+ private String supplierName;
|
|
|
|
|
|
- // 物流公司名称
|
|
|
- @ApiModelProperty("物流公司名称")
|
|
|
- private String companyName;
|
|
|
+ @ApiModelProperty("物流公司名称")
|
|
|
+ private String companyName;
|
|
|
|
|
|
- /**
|
|
|
- * 公司主页
|
|
|
- */
|
|
|
- @ApiModelProperty("公司主页")
|
|
|
- private String companyHomeUrl;
|
|
|
+ /**
|
|
|
+ * 公司主页
|
|
|
+ */
|
|
|
+ @ApiModelProperty("公司主页")
|
|
|
+ private String companyHomeUrl;
|
|
|
|
|
|
- /**
|
|
|
- * 物流查询接口
|
|
|
- */
|
|
|
- @ApiModelProperty("物流查询接口")
|
|
|
- private String queryUrl;
|
|
|
+ /**
|
|
|
+ * 物流查询接口
|
|
|
+ */
|
|
|
+ @ApiModelProperty("物流查询接口")
|
|
|
+ private String queryUrl;
|
|
|
|
|
|
- public Integer getPrice() {
|
|
|
- if (this.skuValue == null) {
|
|
|
- return this.goodsValue;
|
|
|
- }
|
|
|
- return skuValue;
|
|
|
- }
|
|
|
+ public Integer getPrice() {
|
|
|
+ if (this.skuValue == null) {
|
|
|
+ return this.goodsValue;
|
|
|
+ }
|
|
|
+ return skuValue;
|
|
|
+ }
|
|
|
}
|