采购订单列表添加采购商信息

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

@@ -50,6 +50,6 @@ public class UavCartController extends BaseController {
     @GetMapping("list")
     public ResultBody list(@RequestParam Integer pageNo, @RequestParam Integer pageSize,
                            HttpServletRequest request) {
-        return uavCartService.list(pageNo, pageSize);
+        return uavCartService.list(pageNo, pageSize, this.getCurrentAccount(request));
     }
 }

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

@@ -34,6 +34,10 @@ public class UavPurchaseOrderDTO implements Serializable {
     private String uavOrderNo;
     @ApiModelProperty(value = "采购方id")
     private Integer backUserAccountId;
+    @ApiModelProperty(value = "采购方商家公司名称")
+    private String buyCompanyName;
+    @ApiModelProperty(value = "采购方商家公司电话")
+    private String phoneNum;
     @ApiModelProperty(value = "第三方商家用户id")
     private Integer thirdUserAccountId;
     @ApiModelProperty(value = "第三方商家公司名称")

src/main/java/com/mmc/oms/model/qo/uav/UavOrderQO.java

@@ -35,7 +35,7 @@ public class UavOrderQO implements Serializable {
     @ApiModelProperty(value = "商家id", hidden = true)
     private Integer thirdBackUserAccountId;
 
-    @ApiModelProperty(value = "订单类型", hidden = true)
+    @ApiModelProperty(value = "订单类型，0正常订单、1意向订单", hidden = true)
     private Integer orderType;
 
     @ApiModelProperty(value = "订单是否展示给用户", hidden = true)

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.dto.user.BaseAccountDTO;
 import com.mmc.oms.model.vo.uav.UavCartVO;
 
 /**
@@ -14,5 +15,5 @@ public interface UavCartService {
 
     ResultBody updateNum(Integer id, Integer buyNum);
 
-    ResultBody list(Integer pageNo, Integer pageSize);
+    ResultBody list(Integer pageNo, Integer pageSize, BaseAccountDTO currentAccount);
 }

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

@@ -3,6 +3,7 @@ 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.dto.user.BaseAccountDTO;
 import com.mmc.oms.model.vo.uav.UavCartVO;
 import com.mmc.oms.service.uav.UavCartService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ public class UavCartServiceImpl implements UavCartService {
     }
 
     @Override
-    public ResultBody list(Integer pageNo, Integer pageSize) {
+    public ResultBody list(Integer pageNo, Integer pageSize, BaseAccountDTO currentAccount) {
         return null;
     }
 }

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

@@ -116,6 +116,10 @@ public class UavPOServiceImpl implements UavPOService {
         BUserAccountQO bUserAccountQO = new BUserAccountQO();
         bUserAccountQO.setUserIds(userIds);
         List<UserAccountSimpleDTO> accountSimpleDTOS = userAppApi.feignListBAccountPage(bUserAccountQO, currentAccount.getToken());
+        // 采购商，只有科比特
+        BUserAccountQO bUserAccountQO1 = new BUserAccountQO();
+        bUserAccountQO1.setUserIds(Arrays.asList(1));
+        List<UserAccountSimpleDTO> accountSimpleDTOS1 = userAppApi.feignListBAccountPage(bUserAccountQO1, currentAccount.getToken());
         if (CollectionUtils.isNotEmpty(accountSimpleDTOS)) {
             Map<Integer, UserAccountSimpleDTO> accountSimpleDTOMap = accountSimpleDTOS.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, v1 -> v1, (v1, v2) -> v2));
             for (UavPurchaseOrderDTO purchaseOrderDTO : purchaseOrderDTOS) {
@@ -123,6 +127,10 @@ public class UavPOServiceImpl implements UavPOService {
                     purchaseOrderDTO.setCompanyName(accountSimpleDTOMap.get(purchaseOrderDTO.getThirdUserAccountId()).getCompanyName());
                     purchaseOrderDTO.setThirdPhoneNum(accountSimpleDTOMap.get(purchaseOrderDTO.getThirdUserAccountId()).getPhoneNum());
                 }
+                if (CollectionUtils.isNotEmpty(accountSimpleDTOS1)) {
+                    purchaseOrderDTO.setBuyCompanyName(accountSimpleDTOS1.get(0).getCompanyName());
+                    purchaseOrderDTO.setPhoneNum(accountSimpleDTOS1.get(0).getPhoneNum());
+                }
             }
         }
         return ResultBody.success(PageResult.buildPage(pageNo, uavPOrderQO.getPageSize(), count, purchaseOrderDTOS));