采购订单添加主订单编号

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

+package com.mmc.oms.controller.uav;
+
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.controller.BaseController;
+import com.mmc.oms.model.dto.uav.UavCartDTO;
+import com.mmc.oms.model.dto.uav.UavOrderDTO;
+import com.mmc.oms.model.vo.uav.UavCartVO;
+import com.mmc.oms.service.uav.UavCartService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:37
+ */
+@Api(tags = { "最新版-购物车接口" })
+@RestController
+@RequestMapping("/uav-cart/")
+public class UavCartController extends BaseController {
+    @Autowired
+    private UavCartService uavCartService;
+
+    @ApiOperation(value = "加入购物车")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("add")
+    public ResultBody addCart(@RequestBody UavCartVO uavCartVO) {
+        return uavCartService.addCart(uavCartVO);
+    }
+
+    @ApiOperation(value = "移除")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("remove")
+    public ResultBody remove(@RequestParam Integer id) {
+        return uavCartService.remove(id);
+    }
+
+    @ApiOperation(value = "修改数量")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("updateNum")
+    public ResultBody updateNum(@RequestParam(required = true) Integer id,
+                             @ApiParam("改变的数量（正加负减）") @RequestParam(required = true) Integer buyNum, HttpServletRequest request) {
+        return uavCartService.updateNum(id, buyNum);
+    }
+
+    @ApiOperation(value = "购物车列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UavCartDTO.class)})
+    @GetMapping("list")
+    public ResultBody list(@RequestParam Integer pageNo, @RequestParam Integer pageSize,
+                           HttpServletRequest request) {
+        return uavCartService.list(pageNo, pageSize);
+    }
+}

src/main/java/com/mmc/oms/dao/uav/UavCartDao.java

+package com.mmc.oms.dao.uav;
+
+import com.mmc.oms.entity.uav.UavCartDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:38
+ */
+@Mapper
+public interface UavCartDao {
+    void addCart(UavCartDO uavCartDO);
+
+    void remove(Integer id);
+}

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 com.mmc.oms.model.vo.uav.UavCartVO;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,6 +24,7 @@ public class UavCartDO implements Serializable {
     private Integer id;
     private Integer userAccountId;
     private Integer thirdBackUserAccountId;
+    private String companyName;
     private Integer mallGoodsId;
     private String tradeName;
     private Integer priceStockId;
@@ -37,7 +39,22 @@ public class UavCartDO implements Serializable {
         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();
+                .companyName(this.companyName).build();
+    }
+
+    public UavCartDO(UavCartVO uavCartVO){
+        this.id = uavCartVO.getId();
+        this.userAccountId = uavCartVO.getUserAccountId();
+        this.thirdBackUserAccountId = uavCartVO.getThirdBackUserAccountId();
+        this.companyName = uavCartVO.getCompanyName();
+        this.mallGoodsId = uavCartVO.getMallGoodsId();
+        this.tradeName = uavCartVO.getTradeName();
+        this.priceStockId = uavCartVO.getPriceStockId();
+        this.productSpec = uavCartVO.getProductSpec();
+        this.orderNum = uavCartVO.getOrderNum();
+        this.salePrice = uavCartVO.getSalePrice();
+        this.skuImage = uavCartVO.getSkuImage();
+        this.skuNo = uavCartVO.getSkuNo();
     }
 
 }

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

@@ -29,6 +29,8 @@ public class UavPurchaseOrderDO implements Serializable {
     private Integer id;
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
+    @ApiModelProperty(value = "用户订单编号")
+    private String uavOrderNo;
     @ApiModelProperty(value = "采购方id")
     private Integer backUserAccountId;
     @ApiModelProperty(value = "第三方商家用户id")
@@ -56,6 +58,6 @@ public class UavPurchaseOrderDO implements Serializable {
                 .createTime(this.createTime).userRemark(this.userRemark).sellerRemark(this.sellerRemark).skuDTOList(CollectionUtils.isEmpty(skuDOS) ? null :
                         this.skuDOS.stream().map(UavOrderSkuDO::buildUavOrderSkuDTO).collect(Collectors.toList()))
                 .payDTOS(CollectionUtils.isEmpty(skuDOS) ? null : this.payDOS.stream().map(UavPurchaseOrderPayDO::buildUavOrderPayDTO).collect(Collectors.toList()))
-                .build();
+                .uavOrderNo(this.uavOrderNo).build();
     }
 }

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

@@ -26,6 +26,8 @@ public class UavCartDTO implements Serializable {
     private Integer userAccountId;
     @ApiModelProperty(value = "商家id")
     private Integer thirdBackUserAccountId;
+    @ApiModelProperty(value = "商家名称")
+    private String companyName;
     @ApiModelProperty(value = "商品id")
     private Integer mallGoodsId;
     @ApiModelProperty(value = "商品名称")

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

@@ -30,6 +30,8 @@ public class UavPurchaseOrderDTO implements Serializable {
     private Integer id;
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
+    @ApiModelProperty(value = "用户订单编号")
+    private String uavOrderNo;
     @ApiModelProperty(value = "采购方id")
     private Integer backUserAccountId;
     @ApiModelProperty(value = "第三方商家用户id")

src/main/java/com/mmc/oms/model/vo/uav/UavCartVO.java

+package com.mmc.oms.model.vo.uav;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:49
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UavCartVO implements Serializable {
+    private static final long serialVersionUID = 3679112602652045328L;
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "用户ID")
+    @NotNull(message = "用户ID不能为空")
+    private Integer userAccountId;
+    @ApiModelProperty(value = "商家id")
+    @NotNull(message = "商家id不能为空")
+    private Integer thirdBackUserAccountId;
+    @ApiModelProperty(value = "商家名称")
+    @NotNull(message = "商家名称不能为空")
+    private String companyName;
+    @ApiModelProperty(value = "商品id")
+    @NotNull(message = "商品id不能为空")
+    private Integer mallGoodsId;
+    @ApiModelProperty(value = "商品名称")
+    private String tradeName;
+    @ApiModelProperty(value = "商品规格id")
+    private Integer priceStockId;
+    @ApiModelProperty(value = "商品规格名称")
+    @NotNull(message = "商品规格名称不能为空")
+    private String productSpec;
+    @ApiModelProperty(value = "数量")
+    @NotNull(message = "数量不能为空")
+    private Integer orderNum;
+    @ApiModelProperty(value = "售卖价")
+    private BigDecimal salePrice;
+    @ApiModelProperty(value = "主图或规格图")
+    @NotNull(message = "主图或规格图不能为空")
+    private String skuImage;
+    @ApiModelProperty(value = "规格编号")
+    private String skuNo;
+}

src/main/java/com/mmc/oms/service/uav/UavCartService.java

+package com.mmc.oms.service.uav;
+
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.vo.uav.UavCartVO;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:40
+ */
+public interface UavCartService {
+    ResultBody addCart(UavCartVO uavCartVO);
+
+    ResultBody remove(Integer id);
+
+    ResultBody updateNum(Integer id, Integer buyNum);
+
+    ResultBody list(Integer pageNo, Integer pageSize);
+}

src/main/java/com/mmc/oms/service/uav/impl/UavCartServiceImpl.java

+package com.mmc.oms.service.uav.impl;
+
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.dao.uav.UavCartDao;
+import com.mmc.oms.entity.uav.UavCartDO;
+import com.mmc.oms.model.vo.uav.UavCartVO;
+import com.mmc.oms.service.uav.UavCartService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author: zj
+ * @Date: 2023/9/16 14:40
+ */
+@Service
+public class UavCartServiceImpl implements UavCartService {
+    @Autowired
+    private UavCartDao uavCartDao;
+
+    @Override
+    public ResultBody addCart(UavCartVO uavCartVO) {
+        UavCartDO uavCartDO = new UavCartDO(uavCartVO);
+        uavCartDao.addCart(uavCartDO);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody remove(Integer id) {
+        uavCartDao.remove(id);
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody updateNum(Integer id, Integer buyNum) {
+        return null;
+    }
+
+    @Override
+    public ResultBody list(Integer pageNo, Integer pageSize) {
+        return null;
+    }
+}

src/main/java/com/mmc/oms/service/uav/impl/UavPOServiceImpl.java

@@ -106,6 +106,7 @@ public class UavPOServiceImpl implements UavPOService {
         uavPOrderQO.buildCurrentPage();
         List<UavPurchaseOrderDO> uavPurchaseOrderDOS = uavPODao.listPurchaseOrder(uavPOrderQO);
         List<UavPurchaseOrderDTO> purchaseOrderDTOS = uavPurchaseOrderDOS.stream().map(UavPurchaseOrderDO::buildUavPurchaseOrderDTO).collect(Collectors.toList());
+        
         // 提供商信息
         List<Integer> userIds = purchaseOrderDTOS.stream().map(UavPurchaseOrderDTO::getThirdUserAccountId).collect(Collectors.toList());
         BUserAccountQO bUserAccountQO = new BUserAccountQO();

src/main/resources/mapper/uav/UavCartDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.oms.dao.uav.UavCartDao">
+
+    <insert id="addCart" parameterType="com.mmc.oms.entity.uav.UavCartDO" useGeneratedKeys="true" keyProperty="id">
+        insert into uav_cart(user_account_id, third_back_user_account_id, company_name, mall_goods_id, trade_name,
+            price_stock_id, product_spec, order_num, sale_price, sku_image, sku_no, create_time)
+        values (#{userAccountId}, #{thirdBackUserAccountId}, #{companyName}, #{mallGoodsId}, #{tradeName},
+         #{priceStockId}, #{productSpec}, #{orderNum}, #{salePrice}, #{skuImage}, #{skuNo}, NOW());
+    </insert>
+
+    <update id="remove">
+        update uav_cart set is_deleted = 1 where id = #{id}
+    </update>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/uav/UavPODao.xml

@@ -5,6 +5,7 @@
                id="uavPOResultMap">
         <id property="id" column="id" />
         <result property="orderNo" column="order_no" />
+        <result property="uavOrderNo" column="uavOrderNo" />
         <result property="backUserAccountId" column="back_user_account_id" />
         <result property="thirdUserAccountId" column="third_user_account_id" />
         <result property="uavOrderId" column="uav_order_id" />
@@ -24,8 +25,8 @@
     </resultMap>
     
     <sql id="uav_purchase_order_column">
-        id, order_no, back_user_account_id, third_user_account_id, uav_order_id, order_amount, status_code,
-        create_time, user_remark, seller_remark
+        upo.id, upo.order_no, upo.back_user_account_id, upo.third_user_account_id, upo.uav_order_id, upo.order_amount, upo.status_code,
+        upo.create_time, upo.user_remark, upo.seller_remark
     </sql>
 
     <sql id="uav_purchase_order_pay_column">
@@ -110,13 +111,14 @@
     </select>
 
     <select id="getUavPOrder" resultMap="uavPOResultMap">
-        select <include refid="uav_purchase_order_column"/>
-        from uav_purchase_order where id = #{id}
+        select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
+        from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
+        where id = #{id}
     </select>
 
     <select id="listPurchaseOrder" resultMap="uavPOResultMap" parameterType="com.mmc.oms.model.qo.uav.UavPOrderQO">
-        select <include refid="uav_purchase_order_column"/>
-        from uav_purchase_order
+        select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
+        from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
         where 1 = 1
         <if test="keyword != null">
             and order_no = #{orderNo}
@@ -165,13 +167,15 @@
     </select>
 
     <select id="getUavPOrderByUavOId" resultType="com.mmc.oms.entity.uav.UavPurchaseOrderDO">
-        select <include refid="uav_purchase_order_column"/>
-        from uav_purchase_order where uav_order_id = #{uavOrderId}
+        select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
+        from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
+        where uav_order_id = #{uavOrderId}
     </select>
 
     <select id="getUavPOrderByNo" resultType="com.mmc.oms.entity.uav.UavPurchaseOrderDO">
-        select <include refid="uav_purchase_order_column"/>
-        from uav_purchase_order where order_no = #{orderNo}
+        select <include refid="uav_purchase_order_column"/>, uo.order_no as uavOrderNo
+        from uav_purchase_order upo inner join uav_order uo on upo.uav_order_id = uo.id
+        where order_no = #{orderNo}
     </select>
 
     <select id="getUavPOrderPayById" resultType="com.mmc.oms.entity.uav.UavPurchaseOrderPayDO">