组长查看-未支付、未上架订单

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

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

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

@@ -115,6 +115,7 @@
 			<if test=' this.has("importOrderId") '> and import_order_id = #{importOrderId} </if>
 			<if test=' this.has("declareType") '> and declare_type = #{declareType} </if>
 			<if test=' this.has("upStatus") '> and up_status = #{upStatus} </if>
+			<if test=' this.has("Sxb010Status") '> and sxb010_status = #{Sxb010Status} </if>
 
 			<if test='confirmType == "people_confirm_time" and this.has("dateBegin")'> and people_confirm_time &gt;= #{dateBegin} </if>
 			<if test='confirmType == "people_confirm_time" and this.has("dateEnd")'> and people_confirm_time &lt;= #{dateEnd} </if>

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

@@ -72,7 +72,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
     @Autowired
     private TbOrderMapper tbOrderMapper;
     @Autowired
-    TbImportOrderMapper tbImportOrderMapper;
+    private TbImportOrderMapper tbImportOrderMapper;
     /**
      * 互市组
      */
@@ -201,6 +201,23 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         return tbOrderList;
     }
 
+    List<TbOrder> getPeopleOrderList(SoMap so) {
+        //获取登录用户,登录的用户也许边民,互市组组长,一级市场商家
+        APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+        if(appLoginInfo.getUserType() != 2) throw new RuntimeException("当前登陆用户不是边民组长!");
+
+        TbPeople tbPeople = tbPeopleMapper.selectById(appLoginInfo.getFk());
+        if(tbPeople.getGroupId() == null) throw new RuntimeException("当前登陆用户不在互助组内!");
+
+        List<TbPeople> peopleList = tbPeopleService.lambdaQuery().eq(TbPeople::getGroupId, tbPeople.getGroupId()).list();
+        List<Long> idList = peopleList.stream().map(people -> people.getId()).collect(Collectors.toList());
+
+        List<TbOrder> tbOrderList = tbOrderMapper.getList(so);
+
+        List<TbOrder> list = tbOrderList.stream().filter(order -> idList.contains(order.getBuyUserId())).collect(Collectors.toList());
+        return list;
+    }
+
     /**
      * 获取当前登陆人订单集合
      */