Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-server into feature/asyncOrder

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

@@ -171,7 +171,7 @@ public class TbOrderAppController {
 	@RequestMapping("getPeopleOrderList")
 	public AjaxJson getPeopleOrderList() {
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrder> list = tbOrderService.getPeopleOrderList(so.startPage());
+		List<OrderVo> list = tbOrderService.getPeopleOrderList(so.startPage());
 		if(list.size() == 0)return AjaxJson.getSuccess("暂无更多的订单消息!");
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}

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

@@ -202,7 +202,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         return tbOrderList;
     }
 
-    List<TbOrder> getPeopleOrderList(SoMap so) {
+    List<OrderVo> getPeopleOrderList(SoMap so) {
         //获取登录用户,登录的用户也许边民,互市组组长,一级市场商家
         APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
         if (appLoginInfo.getUserType() != 2) throw new RuntimeException("当前登陆用户不是边民组长!");
@@ -216,7 +216,18 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         List<TbOrder> tbOrderList = tbOrderMapper.getList(so);
 
         List<TbOrder> list = tbOrderList.stream().filter(order -> idList.contains(order.getBuyUserId())).collect(Collectors.toList());
-        return list;
+        List<OrderVo> orderVoList = new ArrayList<>();
+        for (TbOrder tbOrder: list) {
+            OrderVo orderVo = new OrderVo();
+            BeanUtils.copyProperties(tbOrder, orderVo);
+            for (TbPeople people:peopleList) {
+                if(people.getId().compareTo(tbOrder.getBuyUserId()) == 0 || people.getId().equals(tbOrder.getBuyUserId())) {
+                    orderVo.setPhone(people.getPhone());
+                }
+            }
+            orderVoList.add(orderVo);
+        }
+        return orderVoList;
     }
 
     /**
@@ -778,7 +789,8 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         String billCode = htPassCardDTO.getBillCode();
         //获取出了一级市场的所有边民订单
         LambdaQueryWrapper<TbOrder> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TbOrder::getPreNo, billCode);
+        //wrapper.eq(TbOrder::getPreNo, billCode);
+        wrapper.eq(TbOrder::getPreIeportNo, billCode);
         List<TbOrder> tbOrders = tbOrderMapper.selectList(wrapper);
         if (tbOrders.isEmpty()) {
             throw new ServiceException(" ------接收到航通007车辆出卡三接口信息,当前获取到的一级市场的边民订单为空。 单证代码billCode = " + billCode);

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

@@ -54,11 +54,18 @@ public class OrderVo {
      * 总金额
      */
     private Double totalPrice;
-
+    /**
+     * 买家ID
+     */
+    private Long buyUserId;
     /**
      * 买家名称
      */
     private String buyUserName;
+    /**
+     * 买家手机号码
+     */
+    private String phone;
 
     /**
      * 买家类型(1=边民,2=组长)
@@ -243,4 +250,5 @@ public class OrderVo {
     private Date upTime;
 
     private BigDecimal upPrice;
+    private Date createTime;
 }