8.16 更换一级市场订单展示的边民信息展示字段

sp-service/level-one-server/src/main/java/com/pj/tb_order/MethodOrderService.java

@@ -14,6 +14,8 @@ import com.pj.tb_goods_transit.TbGoodsTransitMapper;
 import com.pj.tb_group.TbGroup;
 import com.pj.tb_group.TbGroupMapper;
 import com.pj.tb_order.vo.OrderVo;
+import com.pj.tb_order_people_confirm.TbOrderPeopleConfirm;
+import com.pj.tb_order_people_confirm.TbOrderPeopleConfirmMapper;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleMapper;
 import com.pj.utils.so.SoMap;
@@ -46,6 +48,8 @@ public class MethodOrderService {
     @Autowired
     private TbGoodsTransitMapper tbGoodsTransitMapper;
     @Autowired
+    private TbOrderPeopleConfirmMapper tbOrderPeopleConfirmMapper;
+    @Autowired
     private TbGroupMapper tbGroupMapper;
 
     /**
@@ -119,44 +123,13 @@ public class MethodOrderService {
         orderVo.setGrossWeight(goodsTransit.getGrossWeight());
         orderVo.setGoodsTransitCreateTime(goodsTransit.getCreateTime());
         //相关的所有边民
-        List<TbPeople> peopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getGroupId, tbOrder.getGroupId()).eq(TbPeople::getJudgeStatus, JudgeStatus.JUDGE_STATUS_ONE.getCode()).eq(TbPeople::getStatus, 1).eq(TbPeople::getIsLock, IsLock.IS_LOCK_ON.getCode()).eq(TbPeople::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
-        if(peopleList.size() != 0){
-            peopleList.forEach(tbPeople -> {
-                //多余信息置空
-                tbPeople.setAddress(null);
-                tbPeople.setAddressIds(null);
-                tbPeople.setAge(null);
-                tbPeople.setCreateBy(null);
-                tbPeople.setCreateName(null);
-                tbPeople.setCreateTime(null);
-                tbPeople.setUpdateBy(null);
-                tbPeople.setUpdateName(null);
-                tbPeople.setUpdateTime(null);
-                tbPeople.setTradeAreaId(null);
-                tbPeople.setBankCode(null);
-                tbPeople.setBankNo(null);
-                tbPeople.setBankName(null);
-                tbPeople.setIdCard(null);
-                tbPeople.setIdCardImg(null);
-                tbPeople.setJudgeStatus(null);
-                tbPeople.setDeleteStatus(null);
-                tbPeople.setDetailAddress(null);
-                tbPeople.setJudgeTime(null);
-                tbPeople.setRegisterTime(null);
-                tbPeople.setCode(null);
-                tbPeople.setGroupId(null);
-                tbPeople.setIsLock(null);
-                tbPeople.setLeftPrice(null);
-                tbPeople.setLng(null);
-                tbPeople.setLat(null);
-                tbPeople.setLastLocation(null);
-            });
-        }
+        List<TbOrderPeopleConfirm> peopleList = tbOrderPeopleConfirmMapper.selectList
+                (new LambdaQueryWrapper<TbOrderPeopleConfirm>().eq(TbOrderPeopleConfirm::getGroupId, tbOrder.getGroupId()).eq(TbOrderPeopleConfirm::getOrderId, tbOrder.getId()));
         orderVo.setPeopleList(peopleList);
         //订单创建时间
         orderVo.setOrderCreateTime(tbOrder.getCreateTime());
         //购买的互市组名称
-        orderVo.setGroupName(peopleList.get(0).getGroupName());
+        orderVo.setGroupName(tbGroupMapper.selectById(peopleList.get(0).getGroupId()).getName());
         //商户确认时间
         orderVo.setEnterpriseConfirmTime(tbOrder.getCreateTime());
         //todo: orderVo进境时间

sp-service/level-one-server/src/main/java/com/pj/tb_order/vo/OrderVo.java

@@ -1,5 +1,6 @@
 package com.pj.tb_order.vo;
 
+import com.pj.tb_order_people_confirm.TbOrderPeopleConfirm;
 import com.pj.tb_people.TbPeople;
 import lombok.Data;
 
@@ -64,7 +65,7 @@ public class OrderVo {
     /**
      * 边民
      */
-    private List<TbPeople> peopleList;
+    private List<TbOrderPeopleConfirm> peopleList;
 
     /**
      * 商品发布时间