Merge remote-tracking branch 'origin/dev' into dev

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersApiController.java

@@ -57,12 +57,11 @@ public class TbOrdersApiController {
 	}
 
 
-	/** 二级市场收购商查二级市场订单集合 - 根据条件（参数为空时代表忽略指定条件） */
+	/** 二级市场订单*/
 	@RequestMapping("getList")
-//		@SaCheckPermission(TbOrders.PERMISSION_CODE)
-	public AjaxJson getList(@RequestParam(value = "keyword",required = false)String keyword) {
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrders> list = tbOrdersService.getList(so.startPage(),keyword);
+		List<TbOrders> list = tbOrdersService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -79,18 +79,18 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件）
 	 * 管理购买的商品订单（包括已支付、运输中、售后）
 	 * */
-	List<TbOrders> getList(SoMap so,String keyword) {
+	List<TbOrders> getList(SoMap so) {
 		//首先判断该用户是否为收购商
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
 			throw new ServiceException("当前登陆用户信息已失效!");
-		//通过appUser表的fk字段查询二级市场的收购商表
-		TbPurchaser tbPurchaser = tbPurchaserMapper.selectById(appLoginInfo.getFk());
-		if(tbPurchaser == null || tbPurchaser.getDeleteStatus() == 0 || tbPurchaser.getIsLock() == 0)
-			throw new ServiceException("您的身份不是收购商!");
 		//执行查询
-		so.put("purchaserId",appLoginInfo.getFk()); // 收购商编号
-		so.put("keyword",keyword); // 后期可根据关键字进行聚合模糊匹配查询
+		if(appLoginInfo.getUserType()==5){
+			so.put("purchaserId",appLoginInfo.getFk()); // 收购商编号
+		}
+		if(appLoginInfo.getUserType()==2){
+			so.put("leaderId",appLoginInfo.getFk()); // 边民组长id
+		}
 		so.put("sortType",22);
 		so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
 		return tbOrdersMapper.getList(so);