app登录缓存新增互市名称

sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterface.java

@@ -71,4 +71,7 @@ public interface LevelOneServerInterface {
 
     @RequestMapping("/AppUser/rpc/audit")
     public boolean audit(@RequestBody EnterpriseAuditDto dto);
+
+    @RequestMapping("/app/TbCooperative/rpc/getCooperativeById")
+    public CooperativeDto getCooperativeById(@RequestParam("id")Long cooperativeId);
 }

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

@@ -0,0 +1,154 @@
+package com.pj.api.dto;
+
+import java.util.Date;
+
+/**
+ * Model: tb_cooperative -- 合作社
+ * @author lbl
+ */
+public class CooperativeDto {
+
+
+	/**
+	 * 贸易区域id
+	 */
+	private Long tradeAreaId;
+
+	/**
+	 * 贸易区域名称
+	 */
+	private String tradeAreaName;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 法人
+	 */
+	private String legalPerson;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+
+	/**
+	 * 手机号码
+	 */
+	private String contact;
+
+	/**
+	 * 营业执照
+	 */
+	private String businessLicense;
+
+	/**
+	 * 银行名称
+	 */
+	private String bankName;
+
+	/**
+	 * 银行账号
+	 */
+	private String bankAccount;
+
+	/**
+	 * 税号
+	 */
+	private String dutyParagraph;
+
+	/**
+	 * 地址
+	 */
+	private String address;
+
+	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;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLegalPerson() {
+		return legalPerson;
+	}
+
+	public void setLegalPerson(String legalPerson) {
+		this.legalPerson = legalPerson;
+	}
+
+	public String getIdCard() {
+		return idCard;
+	}
+
+	public void setIdCard(String idCard) {
+		this.idCard = idCard;
+	}
+
+	public String getContact() {
+		return contact;
+	}
+
+	public void setContact(String contact) {
+		this.contact = contact;
+	}
+
+	public String getBusinessLicense() {
+		return businessLicense;
+	}
+
+	public void setBusinessLicense(String businessLicense) {
+		this.businessLicense = businessLicense;
+	}
+
+	public String getBankName() {
+		return bankName;
+	}
+
+	public void setBankName(String bankName) {
+		this.bankName = bankName;
+	}
+
+	public String getBankAccount() {
+		return bankAccount;
+	}
+
+	public void setBankAccount(String bankAccount) {
+		this.bankAccount = bankAccount;
+	}
+
+	public String getDutyParagraph() {
+		return dutyParagraph;
+	}
+
+	public void setDutyParagraph(String dutyParagraph) {
+		this.dutyParagraph = dutyParagraph;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+}

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

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

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

@@ -266,25 +266,41 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		switch (appUser.getUserType()){
 			case 1:
 				PeopleDto rpcById = levelOneServerInterface.getRpcById(appUser.getFkId());
-				if(rpcById != null) info.setTradeAreaId(rpcById.getTradeAreaId());
+				if(rpcById != null) {
+					info.setTradeAreaId(rpcById.getTradeAreaId());
+					info.setTradeAreaName(rpcById.getTradeAreaName());
+				}
 				break;
 			case 2:
 				PeopleDto leader = levelOneServerInterface.getRpcById(appUser.getFkId());
-				if(leader != null) info.setTradeAreaId(leader.getTradeAreaId());
+				if(leader != null) {
+					info.setTradeAreaId(leader.getTradeAreaId());
+					info.setTradeAreaName(leader.getTradeAreaName());
+				}
 				break;
 			case 3:
 				System.out.println("收购商无互市区字段");
 				break;
 			case 4:
-				DriverDto byDriverId = transportInterface.getByDriverId(appUser.getFkId());
-				if(byDriverId != null) info.setTradeAreaId(byDriverId.getTradeAreaId());
+				DriverDto driver = transportInterface.getByDriverId(appUser.getFkId());
+				if(driver != null) {
+					info.setTradeAreaId(driver.getTradeAreaId());
+					info.setTradeAreaName(driver.getTradeAreaName());
+				}
 				break;
 			case 5:
 				EnterpriseDto enterprise = levelOneServerInterface.getEnterpriseById(appUser.getFkId());
-				if(enterprise != null) info.setTradeAreaId(enterprise.getTradeAreaId());
+				if(enterprise != null) {
+					info.setTradeAreaId(enterprise.getTradeAreaId());
+					info.setTradeAreaName(enterprise.getTradeAreaName());
+				}
 				break;
 			case 6:
-				//todo: 合作商身份
+				CooperativeDto cooperative = levelOneServerInterface.getCooperativeById(appUser.getFkId());
+				if(cooperative != null) {
+					info.setTradeAreaId(cooperative.getTradeAreaId());
+					info.setTradeAreaName(cooperative.getTradeAreaName());
+				}
 				break;
 			default:
 				throw new SecurityException("身份信息有误");