8.8 边民只能查看自己互市区的商品

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/GoodsTransitAppController.java

@@ -47,19 +47,13 @@ public class GoodsTransitAppController {
     }
 
     /**
-     * 查集合 - 根据APP用户ID查发布的商品（参数为空时代表忽略指定条件）
+     * 查集合 - 互市区边民只能查看自己区域的已上架的商品
      */
     @RequestMapping("getTransitList")
 //		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
     public AjaxJson getTransitList() {
-        //获取app登录用户
-        APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
-        if (appLoginInfo == null) throw new RuntimeException("当前登陆用户信息已失效!");
-
         SoMap so = SoMap.getRequestSoMap();
-        so.put("merchantId", appLoginInfo.getFk());
-        so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode());
-        List<TbGoodsTransit> list = tbGoodsTransitService.getList(so.startPage());
+        List<TbGoodsTransit> list = tbGoodsTransitService.getAppList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);
     }
 

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.*;
@@ -111,6 +112,24 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		return tbGoodsTransitMapper.getList(so);
 	}
 
+	/** 查集合 - 互市区边民只能查看自己区域的已上架的商品 */
+	List<TbGoodsTransit> getAppList(SoMap so) {
+		//获取app登录用户
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if (appLoginInfo == null) throw new RuntimeException("当前登陆用户信息已失效!");
+		//判断是否属于边民表的人
+		TbPeople tbPeople = tbPeopleMapper.selectById(appLoginInfo.getFk());
+		if(tbPeople == null)throw new ServiceException("您当前身份不属于边民!");
+		//添加互市区条件
+		so.put("tradeAreaId",tbPeople.getTradeAreaId()); // 根据边民的所在互市区匹配其能查看的商品
+		so.put("merchantId", appLoginInfo.getFk());
+		so.put("goodsStatus",GoodsStatus.GOODS_STATUS_ON.getCode()); // 商品上架
+		so.put("isOrders",0); // 未被下单
+		so.set("auditStatus",AuditStatus.AUDIT_STATUS_ON.getCode()); // 审核通过
+		so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode()); // 未被逻辑删除
+		return tbGoodsTransitMapper.getList(so);
+	}
+
 	/** 查看一级市场在销/上架商品 */
 	List<TbGoodsTransit> getTransitList(SoMap so,String goodsType){
 		//设置可展示的状态

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

@@ -223,10 +223,18 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	/**
 	 * 删除状态(0=禁用,1=启用) 
 	 */
-	private Integer deleteStatus;	
+	private Integer deleteStatus;
 
 
+	/**
+	 * 互市区域ID
+	 */
+	private Long tradeAreaId;
 
+	/**
+	 * 互市区名称
+	 */
+	private String tradeAreaName;
 
 
 	

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/AppTbGoodsDemandController.java

@@ -24,7 +24,7 @@ public class AppTbGoodsDemandController {
 	@Autowired
 	TbGoodsDemandService tbGoodsDemandService;
 
-	/** 增 */  
+	/** 二级市场收购商发布需求 */
 	@RequestMapping("add")
 //	@SaCheckPermission(TbGoodsDemand.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbGoodsDemand t){
@@ -66,7 +66,7 @@ public class AppTbGoodsDemandController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** app端:专供给一级市场查看的需求列表*/
+	/** app端:专供给二级市场查看的需求列表*/
 	@RequestMapping("getAppList")
 //		@SaCheckPermission(TbGoodsDemand.PERMISSION_CODE)
 	public AjaxJson getAppList(@RequestParam(value = "isOrders",required = false)Integer isOrders) {
@@ -75,7 +75,7 @@ public class AppTbGoodsDemandController {
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 	
-	/** app端:专供给一级市场查看的需求列表*/
+	/** app端:二级收购商查看当前已被报价的需求列表*/
 	@RequestMapping("goodsDemandList")
 //		@SaCheckPermission(TbGoodsDemand.PERMISSION_CODE)
 	public AjaxJson goodsDemandList(@RequestParam(value = "isOrders",required = false)Integer isOrders) {

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -102,7 +102,7 @@ public class MethodGoodsDemandService {
 
             //关联一级市场订单表 根据创建时间 和 appUserID 进行查询
             List<OrderDto> orderDtos = levelOneServerInterface.selectOrderList(new Date(), appLoginUserInfo.getLoginId());
-            if(orderDtos.size() != 1)throw new ServiceException("一级市场暂未接单!");
+            if(orderDtos.size() != 1)throw new RuntimeException("一级市场暂未接单!");
             //开始创建订单
             TbOrders tbOrders = new TbOrders();
             //一级市场关联二级市场

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemand.java

@@ -86,7 +86,17 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	/**
 	 * 商家备注 
 	 */
-	private String remark;	
+	private String remark;
+
+	/**
+	 * 创建人编号
+	 */
+	private Long createBy;
+
+	/**
+	 * 创建人名称
+	 */
+	private String createName;
 
 	/**
 	 * 创建时间 
@@ -95,6 +105,39 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	private Date createTime;
 
 	/**
+	 * 更新时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date updateTime;
+
+	/**
+	 * 到货时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date arrivalTime;
+
+
+	/**
+	 * 更新人编号
+	 */
+	private Long updateBy;
+
+	/**
+	 * 更新人名称
+	 */
+	private String updateName;
+
+	/**
+	 * 计价单位
+	 */
+	private String goodsUnit;
+
+	/**
+	 * 商品编号
+	 */
+	private String goodsNo;
+
+	/**
 	 * 删除状态 
 	 */
 	private Integer deleteStatus;
@@ -119,4 +162,6 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	 */
 	private Long addressId;
 
+
+
 }

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemandMapper.xml

@@ -25,6 +25,7 @@
 			<if test=' this.has("id") '> and id = #{id} </if>
 			<if test=' this.has("levelOneGoodsId") '> and level_one_goods_id = #{levelOneGoodsId} </if>
 			<if test=' this.has("goodsName") '> and goods_name = #{goodsName} </if>
+			<if test=' this.has("goodsNo") '> and goods_no = #{goodsNo} </if>
 			<if test=' this.has("goodsImg") '> and goods_img = #{goodsImg} </if>
 			<if test=' this.has("purchaserId") '> and purchaser_id = #{purchaserId} </if>
 			<if test=' this.has("purchaserName") '> and purchaser_name = #{purchaserName} </if>

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemandService.java

@@ -1,5 +1,6 @@
 package com.pj.tb_goods_demand;
 
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,6 +8,7 @@ import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
+import com.pj.enummj.OrderStatus;
 import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -32,8 +34,18 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 	@Autowired
 	private MethodGoodsDemandService methodGoodsDemandService;
 
-	/** 增 */
+	/** 二级市场收购商发布需求 */
 	void add(TbGoodsDemand t){
+		//获取并判断当前登陆人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new ServiceException("当前登录账号信息已失效!");
+		//设置基本状态
+		t.setIsOrders(0); // 0= 未被下单
+		t.setCreateBy(appLoginInfo.getLoginId());
+		t.setCreateName(appLoginInfo.getLoginName());
+		t.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+		t.setCreateTime(new Date());
 		save(t);
 	}
 
@@ -44,6 +56,14 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 
 	/** 改 */
 	void update(TbGoodsDemand t){
+		//获取并判断当前登陆人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new ServiceException("当前登录账号信息已失效!");
+		//执行修改
+		t.setUpdateBy(appLoginInfo.getLoginId());
+		t.setUpdateName(appLoginInfo.getLoginName());
+		t.setUpdateTime(new Date());
 		updateById(t);
 
 	}
@@ -58,7 +78,7 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 		return tbGoodsDemandMapper.getList(so);
 	}
 
-	/** app端:专供给一级市场查看的需求列表 */
+	/** app端:专供给二级市场查看的需求列表 */
 	List<TbGoodsDemand> getAppList(SoMap so,Integer isOrders) {
 		so.put("isOrders",isOrders);
 		so.put("sortType",10); //根据日期降序

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

@@ -150,12 +150,11 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date updateTime;
 
+
 	/**
-	 * 创建时间
+	 * 更新人编号
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTime;
-
+	private Long updateBy;
 	/**
 	 * 更新人名称
 	 */
@@ -167,9 +166,10 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	private Integer deleteStatus;
 
 	/**
-	 * 更新人编号
+	 * 创建时间
 	 */
-	private Long updateBy;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createTime;
 
 	/**
 	 * 创建人编号