8.8 一级市场订单表新增字段

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

@@ -166,6 +166,8 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 */
 	private Long recordUserId;
 
+
+
 	/**
 	 * 对账时间
 	 */

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

@@ -29,6 +29,8 @@
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
 			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
+			<if test=' this.has("cancelPeople") '> and cancel_people = #{cancelPeople} </if>
 			<if test=' this.has("groupId") '> and group_id = #{groupId} </if>
 			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
 			<if test=' this.has("addressIds") '> and address_ids = #{addressIds} </if>

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

@@ -163,23 +163,25 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 			throw new RuntimeException("当前登录账号信息已失效!");
 		Integer userType = appLoginInfo.getUserType();
 		//匹配case
-		switch (orderStatus){
-			case 0:
-				so.put("enterpriseConfirm",0);
-				break;
-			case 1:
-				so.put("apply",0);
-				break;
-			case 2:
-				so.put("finishStatus",1);
-				break;
-			case 3:
-				so.put("cancelPeople",1);
-				break;
+		if(orderStatus != null){
+			switch (orderStatus){
+				case 0:
+					so.put("enterpriseConfirm",0);
+					break;
+				case 1:
+					so.put("apply",0);
+					break;
+				case 2:
+					so.put("finishStatus",1);
+					break;
+				case 3:
+					so.put("cancelPeople",1);
+					break;
+			}
 		}
 		//与订单相关的人能看
 		List<TbOrder> tbOrderList = methodOrderService.checkType(userType,appLoginInfo.getFk(),so);
-		return tbOrderList;
+ 		return tbOrderList;
 	}
 
 	/** 获取当前登陆人订单集合 */

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

@@ -513,9 +513,9 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 
 	/** 查集合 远程调用 */
 	List<PeopleDto> getPeopleList(SoMap so,Long groupId) {
-		so.set("group_id",groupId);
-		so.set("is_lock",IsLock.IS_LOCK_ON.getCode());
-		so.set("delete_status",DeleteStatus.DELETE_STATUS_ON.getCode());
+		so.put("groupId",groupId);
+		so.put("isLock",IsLock.IS_LOCK_ON.getCode());
+		so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
 		List<TbPeople> tbPeople = tbPeopleMapper.getList(so);
 		if(tbPeople.size() == 0)return null;
 		//创建返回值集合