app转售功能修改

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

@@ -75,6 +75,8 @@ public class MethodOrderService {
                 //添加未被边民/组长取消条件
                 so.put("cancelPeople",0);
                 break;
+            case 6: // 合作社
+                break;
             default:
                 throw new ServiceException("服务器繁忙~");
         }

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

@@ -286,7 +286,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private String sendTime;
 
 	/**
-	 * 对应二级市场中的收购单ID
+	 * 对应合作社的拼单订单ID
 	 */
 	private Long collageOrdersId;
 

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

@@ -84,6 +84,7 @@
 			<if test=' this.has("resaleStatus") '> and resale_status = #{resaleStatus} </if>
 			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
 			<if test=' this.has("peopleConfirmType") '> and people_confirm_type = #{peopleConfirmType} </if>
+			<if test=' this.has("collageOrdersId") '> and collage_orders_id = #{collageOrdersId} </if>
 		</where>
 		order by
 		<choose>

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

@@ -49,18 +49,17 @@ public class TbOrdersApiController {
 		return AjaxJson.getByLine(line);
 	}
 
-	/** 改 */
-	@RequestMapping("update")
-	public AjaxJson update(TbOrders t){
-		tbOrdersService.update(t);
-		return AjaxJson.getSuccess();
+	/** 改 收购商购买*/
+	@RequestMapping("purchaserBuy")
+	public AjaxJson purchaserBuy(TbOrders t){
+		return AjaxJson.toAjax(tbOrdersService.purchaserBuy(t));
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
-	@RequestMapping("getList")
-	public AjaxJson getList(@RequestParam(value = "orderFinish",required = false)Integer orderFinish) {
+	/** 查集合 - 查二级市场订单(未被购买的订单) */
+	@RequestMapping("getLevelTwoList")
+	public AjaxJson getLevelTwoList() {
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrders> list = tbOrdersService.getList(so);
+		List<TbOrders> list = tbOrdersService.getLevelTwoList(so);
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 
@@ -76,7 +75,7 @@ public class TbOrdersApiController {
 	@RequestMapping("getPurchaserOrderList")
 	public AjaxJson getPurchaserOrderList() {
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrdersDto> list = tbOrdersService.getPurchaserOrderList(so.startPage());
+		List<TbOrders> list = tbOrdersService.getPurchaserOrderList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
 
 /**
  * Mapper: tb_orders -- 订单表
- * @author qzy 
+ * @author qzy
  */
 
 @Mapper
@@ -21,8 +21,8 @@ public interface TbOrdersMapper extends BaseMapper <TbOrders> {
 
 	/**
 	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
-	 * @param so 参数集合 
-	 * @return 数据列表 
+	 * @param so 参数集合
+	 * @return 数据列表
 	 */
 	List<TbOrders> getList(SoMap so);
 
@@ -32,5 +32,5 @@ public interface TbOrdersMapper extends BaseMapper <TbOrders> {
 	 */
 	List<TbOrders> getList();
 
-
+	List<TbOrders> getLevelTwoList(SoMap so);
 }

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

@@ -91,7 +91,9 @@
 		</choose>
 	</select>
 
-
+	<select id="getLevelTwoList" resultMap="model">
+		select * from tb_orders where purchaser_id is null and (purchaser_name is null or purchaser_name='')
+	</select>
 
 
 

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

@@ -75,6 +75,19 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		updateById(t);
 
 	}
+    /** 改 收购商购买 */
+    boolean purchaserBuy(TbOrders t){
+		// 获取app登录用户
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+
+		// 获取收购商ID与名称
+		TbPurchaser purchaser = tbPurchaserMapper.selectById(appLoginInfo.getFk());
+		if(null == purchaser) throw new RuntimeException("当前收购商账号异常，请重新登录或联系管理员！");
+		t.setPurchaserId(purchaser.getId());
+		t.setPurchaserName(purchaser.getName());
+
+		return updateById(t);
+    }
 
 	/** 查 */
 	TbOrders getById(Long id){
@@ -98,6 +111,13 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 	}
 
 	/**
+	 * 查集合 - 查二级市场订单(未被购买的订单)
+	 */
+	List<TbOrders> getLevelTwoList(SoMap so) {
+		return tbOrdersMapper.getLevelTwoList(so);
+	}
+
+	/**
 	 * 二级市场订单 组长角色入口
 	 * 管理购买的商品订单（包括已支付、运输中、售后）
 	 * */
@@ -115,14 +135,14 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 	 * 二级市场订单 收购商角色入口
 	 * 管理购买的商品订单（包括已支付、运输中、售后）
 	 * */
-	List<TbOrdersDto> getPurchaserOrderList(SoMap so) {
+	List<TbOrders> getPurchaserOrderList(SoMap so) {
 		// 收购商id
 		so.put("purchaserId",StpAPPUserUtil.getAPPLoginInfo().getFk());
 		so.put("sortType",22);
 		so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
 		List<TbOrders> orderList = tbOrdersMapper.getList(so);
 
-		return methodOrdersService.getTbOrdersDto(orderList);
+		return orderList;
 	}
 
 	/**