修改订单备注接口

src/main/java/com/mmc/oms/controller/uav/UavOrderController.java

@@ -108,7 +108,7 @@ public class UavOrderController extends BaseController {
     @ApiOperation(value = "卖家备注")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("sellerRemark")
-    public ResultBody sellerRemark(@RequestParam Integer id, @RequestParam String content) {
+    public ResultBody sellerRemark(@RequestParam Integer id, @RequestParam(required = false) String content) {
         return uavOrderService.sellerRemark(id, content);
     }
 

src/main/java/com/mmc/oms/controller/uav/UavPOController.java

@@ -73,14 +73,14 @@ public class UavPOController extends BaseController {
     @ApiOperation(value = "平台备注")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("userRemark")
-    public ResultBody userRemark(@RequestParam Integer id, @RequestParam String content) {
+    public ResultBody userRemark(@RequestParam Integer id, @RequestParam(required = false) String content) {
         return uavPOService.userRemark(id, content);
     }
 
     @ApiOperation(value = "商家备注")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("sellerRemark")
-    public ResultBody sellerRemark(@RequestParam Integer id, @RequestParam String content) {
+    public ResultBody sellerRemark(@RequestParam Integer id, @RequestParam(required = false) String content) {
         return uavPOService.sellerRemark(id, content);
     }
 }

src/main/java/com/mmc/oms/entity/uav/UavCartDO.java

+package com.mmc.oms.entity.uav;
+
+import com.mmc.oms.model.dto.uav.UavCartDTO;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("最新版-商城购物车")
+public class UavCartDO implements Serializable {
+    private static final long serialVersionUID = 3845763818022578395L;
+    private Integer id;
+    private Integer userAccountId;
+    private Integer thirdBackUserAccountId;
+    private Integer mallGoodsId;
+    private String tradeName;
+    private Integer priceStockId;
+    private String productSpec;
+    private Integer orderNum;
+    private BigDecimal salePrice;
+    private String skuImage;
+    private String skuNo;
+    private Date createTime;
+
+    public UavCartDTO buildUavCartDTO() {
+        return UavCartDTO.builder().id(this.id).userAccountId(this.userAccountId).thirdBackUserAccountId(thirdBackUserAccountId)
+                .mallGoodsId(this.mallGoodsId).tradeName(this.tradeName).priceStockId(this.priceStockId).productSpec(this.productSpec)
+                .orderNum(this.orderNum).salePrice(this.salePrice).skuImage(this.skuImage).skuNo(this.skuNo).createTime(createTime)
+                .build();
+    }
+
+}

src/main/java/com/mmc/oms/model/dto/uav/UavCartDTO.java

+package com.mmc.oms.model.dto.uav;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:08
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UavCartDTO implements Serializable {
+    private static final long serialVersionUID = 4386011514861211847L;
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "用户ID")
+    private Integer userAccountId;
+    @ApiModelProperty(value = "商家id")
+    private Integer thirdBackUserAccountId;
+    @ApiModelProperty(value = "商品id")
+    private Integer mallGoodsId;
+    @ApiModelProperty(value = "商品名称")
+    private String tradeName;
+    @ApiModelProperty(value = "商品规格id")
+    private Integer priceStockId;
+    @ApiModelProperty(value = "商品规格名称")
+    private String productSpec;
+    @ApiModelProperty(value = "数量")
+    private Integer orderNum;
+    @ApiModelProperty(value = "售卖价")
+    private BigDecimal salePrice;
+    @ApiModelProperty(value = "主图或规格图")
+    private String skuImage;
+    @ApiModelProperty(value = "规格编号")
+    private String skuNo;
+    @ApiModelProperty(value = "生成时间")
+    private Date createTime;
+}