8.8 将互市区ID缓存到登录信息当中

sp-core/sp-api/src/main/java/com/pj/api/dto/PeopleDto.java

@@ -149,6 +149,71 @@ public class PeopleDto {
      */
     private String personId;
 
+    public PeopleDto(String name, String code, Integer sex, Integer age, String idCard, String idCardImg, String phone, String bankNo, String bankCode, String bankName, Long groupId, String groupName, Integer status, Integer role, Double lng, Double lat, String lastLocation, String address, String addressIds, String detailAddress, Integer isLock, Double leftPrice, Integer judgeStatus, String judgeContent, Date registerTime, Date judgeTime, String personId, Long tradeAreaId, String tradeAreaName, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus) {
+        this.name = name;
+        this.code = code;
+        this.sex = sex;
+        this.age = age;
+        this.idCard = idCard;
+        this.idCardImg = idCardImg;
+        this.phone = phone;
+        this.bankNo = bankNo;
+        this.bankCode = bankCode;
+        this.bankName = bankName;
+        this.groupId = groupId;
+        this.groupName = groupName;
+        this.status = status;
+        this.role = role;
+        this.lng = lng;
+        this.lat = lat;
+        this.lastLocation = lastLocation;
+        this.address = address;
+        this.addressIds = addressIds;
+        this.detailAddress = detailAddress;
+        this.isLock = isLock;
+        this.leftPrice = leftPrice;
+        this.judgeStatus = judgeStatus;
+        this.judgeContent = judgeContent;
+        this.registerTime = registerTime;
+        this.judgeTime = judgeTime;
+        this.personId = personId;
+        this.tradeAreaId = tradeAreaId;
+        this.tradeAreaName = tradeAreaName;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Long getTradeAreaId() {
+        return tradeAreaId;
+    }
+
+    public void setTradeAreaId(Long tradeAreaId) {
+        this.tradeAreaId = tradeAreaId;
+    }
+
+    public String getTradeAreaName() {
+        return tradeAreaName;
+    }
+
+    public void setTradeAreaName(String tradeAreaName) {
+        this.tradeAreaName = tradeAreaName;
+    }
+
+    /**
+     * 互市区域ID
+     */
+    private Long tradeAreaId;
+
+    /**
+     * 互市区名称
+     */
+    private String tradeAreaName;
+
     /**
      * 创建时间
      */

sp-core/sp-base/src/main/java/com/pj/current/dto/APPLoginUserInfo.java

@@ -15,4 +15,5 @@ public class APPLoginUserInfo implements Serializable {
     private Integer userType;
     private Long groupId;
     private String groupName;
+    private Long tradeAreaId;
 }

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

@@ -47,7 +47,7 @@ public class GoodsTransitAppController {
     }
 
     /**
-     * 查集合 - 互市区边民只能查看自己区域的已上架的商品
+     * 查集合 - 根据自己的互市区ID查询对应互市区的商品
      */
     @RequestMapping("getTransitList")
 //		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)

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

@@ -112,17 +112,14 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		return tbGoodsTransitMapper.getList(so);
 	}
 
-	/** 查集合 - 互市区边民只能查看自己区域的已上架的商品 */
+	/** 查集合 - 根据自己的互市区ID查询对应互市区的商品 */
 	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("tradeAreaId",appLoginInfo.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()); // 审核通过

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -7,7 +7,9 @@ import java.util.stream.Collectors;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.api.dto.AppUserDto;
+import com.pj.api.dto.PeopleDto;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
@@ -54,6 +56,8 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 	/** 阿里云验证码 */
 	@Autowired
 	private SmsRetryService smsRetryService;
+	@Autowired
+	private LevelOneServerInterface levelOneServerInterface;
 	/** 验证码前缀 */
 	String PREFIX = "app_user:phone:sms_code:";
 
@@ -187,6 +191,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		appUser.setLastLoginTime(new Date());
 		//保存
 		appUserMapper.updateById(appUser);
+
 		//开始执行登录
 		StpAPPUserUtil.login(appUser.getId());
 		// 组织返回参数,直接拿过来用的,然后自己改吧改吧
@@ -205,6 +210,9 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		map.put("tokenInfo", StpAPPUserUtil.getTokenInfo());
 //		StpAPPUserUtil.cachePerList(per_list);
 		APPLoginUserInfo info=new APPLoginUserInfo();
+		//获取区域
+		PeopleDto rpcById = levelOneServerInterface.getRpcById(appUser.getFkId());
+		if(rpcById != null) info.setTradeAreaId(rpcById.getTradeAreaId());
 		info.setLoginId(appUser.getId());
 		info.setLoginName(appUser.getName());
 		info.setFk(appUser.getFkId());