8.16 完善一级市场订单详情相关

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

@@ -121,15 +121,16 @@ public class MethodOrderService {
         TbGoodsTransit goodsTransit = tbGoodsTransitMapper.selectById(tbOrder.getGoodsId());
         if(goodsTransit == null)
             throw new ServiceException("过审商品信息异常!");
+        orderVo.setOrderId(tbOrder.getId());
         orderVo.setGoodsTransitName(goodsTransit.getGoodsName());
         orderVo.setGoodsUnit(goodsTransit.getGoodsUnits());
         orderVo.setNetWeight(goodsTransit.getNetWeight());
         orderVo.setGrossWeight(goodsTransit.getGrossWeight());
         orderVo.setGoodsTransitCreateTime(goodsTransit.getCreateTime());
         //相关的所有边民
-        List<TbOrderPeopleConfirm> peopleList = tbOrderPeopleConfirmMapper.selectList
-                (new LambdaQueryWrapper<TbOrderPeopleConfirm>().eq(TbOrderPeopleConfirm::getGroupId, tbOrder.getGroupId()).eq(TbOrderPeopleConfirm::getOrderId, tbOrder.getId()));
-        orderVo.setPeopleList(peopleList);
+//        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());
         //购买的互市组名称

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

@@ -122,6 +122,15 @@ public class TbOrderAppController {
 	public AjaxJson orderDetail(Long orderId){
 		return AjaxJson.getSuccessData(tbOrderService.orderDetail(orderId));
 	}
+	/**
+	 * 根据ID获取订单详情
+	 * @param orderId
+	 * @return
+	 */
+	@GetMapping("selectPeopleConfirmByOrderId")
+	public AjaxJson selectPeopleConfirmByGroupId(Long orderId){
+		return AjaxJson.getSuccessData(tbOrderService.selectPeopleConfirmByOrderId(orderId));
+	}
 
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
 

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

@@ -22,6 +22,8 @@ import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_goods_transit.TbGoodsTransitMapper;
 import com.pj.tb_goods_transit.TbGoodsTransitService;
 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;
@@ -50,7 +52,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 
 	@Autowired
 	private MethodOrderService methodOrderService;
-
 	@Autowired
 	private TbGoodsTransitMapper tbGoodsTransitMapper;
 	@Autowired
@@ -59,6 +60,8 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	private LevelOneServerInterface levelOneServerInterface;
 	@Autowired
 	private TbEnterpriseMapper tbEnterpriseMapper;
+	@Autowired
+	private TbOrderPeopleConfirmMapper tbOrderPeopleConfirmMapper;
 
 	/**
 	 * 远程调用
@@ -293,6 +296,24 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		return orderVo;
 	}
 
+	/**
+	 * 根据订单ID查询边民确认订单信息
+	 * @param orderId
+	 * @return
+	 */
+	public List<TbOrderPeopleConfirm> selectPeopleConfirmByOrderId(Long orderId){
+		List<TbOrderPeopleConfirm> tbOrderPeopleConfirms = tbOrderPeopleConfirmMapper.selectList(new LambdaQueryWrapper<TbOrderPeopleConfirm>().eq(TbOrderPeopleConfirm::getOrderId, orderId));
+		if(tbOrderPeopleConfirms.size() > 0){
+			tbOrderPeopleConfirms.forEach(item -> {
+				item.setOrderId(null);
+				item.setGroupId(null);
+				item.setId(null);
+				item.setPeopleId(null);
+			});
+		}
+		return tbOrderPeopleConfirms;
+	}
+
 	/** 远程调用:根据时间和登陆人查询订单 */
 	public List<OrderDto> selectOrderList( Long appUserId){
 		//判断当前是否已接单

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

@@ -15,6 +15,8 @@ import java.util.List;
 public class OrderVo {
 
 
+    private Long orderId;
+
     /**
      * 订单编号
      */
@@ -65,7 +67,7 @@ public class OrderVo {
     /**
      * 边民
      */
-    private List<TbOrderPeopleConfirm> peopleList;
+//    private List<TbOrderPeopleConfirm> peopleList;
 
     /**
      * 商品发布时间

sp-service/level-one-server/src/main/java/com/pj/tb_order_people_confirm/TbOrderPeopleConfirm.java

@@ -51,7 +51,12 @@ public class TbOrderPeopleConfirm extends Model<TbOrderPeopleConfirm> implements
 	/**
 	 * 一级订单表主键ID 
 	 */
-	private Long orderId;	
+	private Long orderId;
+
+	/**
+	 * 边民名称
+	 */
+	private String peopleName;
 
 	/**
 	 * 一级市场边民ID 
@@ -69,6 +74,16 @@ public class TbOrderPeopleConfirm extends Model<TbOrderPeopleConfirm> implements
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
+	/**
+	 * 进口申报
+	 */
+	private Integer importApply;
+
+	/**
+	 * 进境申报
+	 */
+	private Integer progressApply;
+
 
 
 

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -312,6 +312,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		tbOrderPeopleConfirm.setPeopleId(tbPeople.getId());
 		tbOrderPeopleConfirm.setGroupId(tbPeople.getGroupId());
 		tbOrderPeopleConfirm.setOrderId(orderId);
+		tbOrderPeopleConfirm.setPeopleName(tbPeople.getName());
 		tbOrderPeopleConfirm.setCreateTime(new Date());
 		int insert = tbOrderPeopleConfirmMapper.insert(tbOrderPeopleConfirm);
 		//执行查询订单完成情况