订单列表添加用户信息

src/main/java/com/mmc/oms/feign/UserAppApi.java

@@ -3,11 +3,16 @@ package com.mmc.oms.feign;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.feign.hystrix.UserAppApiHystrix;
 import com.mmc.oms.model.dto.uav.PayWalletDTO;
+import com.mmc.oms.model.dto.user.UserAccountSimpleDTO;
+import com.mmc.oms.model.qo.UserAccountQO;
 import com.mmc.oms.model.vo.uav.PayUavWalletVO;
 import com.mmc.oms.model.vo.wallet.TopUpOrderVO;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author: zj
  * @Date: 2023/5/18 17:06
@@ -26,4 +31,14 @@ public interface UserAppApi {
     @GetMapping("company/getManagerIdByBackUserId")
     public ResultBody getManagerIdByBackUserId(@RequestParam Integer backUserAccountId, @RequestHeader String token);
 
+    /**
+     * 获取小程序用户集合列表页面
+     *
+     * @param userAccountQO
+     * @param token
+     * @return
+     */
+    @PostMapping("/userapp/user-account/feignListAppUserAccount")
+    List<UserAccountSimpleDTO> feignListAppUserAccount(@ApiParam(value = "账号查询QO", required = true) @RequestBody UserAccountQO userAccountQO, @RequestHeader("token") String token);
+
 }

src/main/java/com/mmc/oms/feign/hystrix/UserAppApiHystrix.java

@@ -4,10 +4,14 @@ import com.alibaba.fastjson2.JSONObject;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.feign.UserAppApi;
 import com.mmc.oms.model.dto.uav.PayWalletDTO;
+import com.mmc.oms.model.dto.user.UserAccountSimpleDTO;
+import com.mmc.oms.model.qo.UserAccountQO;
 import com.mmc.oms.model.vo.uav.PayUavWalletVO;
 import com.mmc.oms.model.vo.wallet.TopUpOrderVO;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.List;
+
 /**
  * @author: zj
  * @Date: 2023/5/18 17:08
@@ -38,4 +42,10 @@ public class UserAppApiHystrix implements UserAppApi {
         log.error("熔断：UserAppApiHystrix.getManagerIdByBackUserId==error==>param:{}", JSONObject.toJSONString(backUserAccountId));
         return ResultBody.error("-1", "远程调用失败");
     }
+
+    @Override
+    public List<UserAccountSimpleDTO> feignListAppUserAccount(UserAccountQO userAccountQO, String token) {
+        log.error("熔断：UserAppApiHystrix.feignListAppUserAccount：{}", userAccountQO);
+        return null;
+    }
 }

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

@@ -32,6 +32,12 @@ public class UavOrderDTO implements Serializable {
     private Integer statusCode;
     @ApiModelProperty("买家id")
     private Integer userAccountId;
+    @ApiModelProperty("买家手机号")
+    private String phoneNum;
+    @ApiModelProperty("买家姓名")
+    private String userName;
+    @ApiModelProperty("买家昵称")
+    private String nickname;
     @ApiModelProperty("卖家id")
     private Integer thirdBackUserAccountId;
     @ApiModelProperty("卖家企业名称")

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

@@ -22,6 +22,8 @@ import com.mmc.oms.model.dto.kdn.KdnExpDTO;
 import com.mmc.oms.model.dto.order.ExpStationsDTO;
 import com.mmc.oms.model.dto.uav.*;
 import com.mmc.oms.model.dto.user.BaseAccountDTO;
+import com.mmc.oms.model.dto.user.UserAccountSimpleDTO;
+import com.mmc.oms.model.qo.UserAccountQO;
 import com.mmc.oms.model.qo.uav.UavOrderQO;
 import com.mmc.oms.model.vo.ApplyRefundVO;
 import com.mmc.oms.model.vo.demand.CommonPaymentVO;
@@ -286,8 +288,22 @@ public class UavOrderServiceImpl implements UavOrderService {
         Integer pageNo = uavOrderQO.getPageNo();
         uavOrderQO.buildCurrentPage();
         List<UavOrderDO> uavOrderDOS = uavOrderDao.list(uavOrderQO);
-        // TODO 买家信息
         List<UavOrderDTO> uavOrderDTOS = uavOrderDOS.stream().map(UavOrderDO::buildUavOrderDTO).collect(Collectors.toList());
+        List<Integer> userIds = uavOrderDTOS.stream().map(UavOrderDTO::getUserAccountId).collect(Collectors.toList());
+        // TODO 买家信息
+        UserAccountQO userAccountQO = new UserAccountQO();
+        userAccountQO.setUserIds(userIds);
+        List<UserAccountSimpleDTO> userDTOS = userAppApi.feignListAppUserAccount(userAccountQO, currentAccount.getToken());
+        if (CollectionUtils.isNotEmpty(userDTOS)) {
+            Map<Integer, UserAccountSimpleDTO> collect = userDTOS.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, user -> user, (k1, k2) -> k2));
+            for (UavOrderDTO uavOrderDTO : uavOrderDTOS) {
+                if (collect.containsKey(uavOrderDTO.getUserAccountId())) {
+                    uavOrderDTO.setPhoneNum(collect.get(uavOrderDTO.getUserAccountId()).getPhoneNum());
+                    uavOrderDTO.setNickname(collect.get(uavOrderDTO.getUserAccountId()).getNickName());
+                    uavOrderDTO.setUserName(collect.get(uavOrderDTO.getUserAccountId()).getUserName());
+                }
+            }
+        }
         return ResultBody.success(PageResult.buildPage(pageNo, uavOrderQO.getPageSize(), count, uavOrderDTOS));
     }