qzyReal 1 рік тому
батько
коміт
b87cd1a67d

+ 0 - 1
app.pid

@@ -1 +0,0 @@
-30260

+ 15 - 0
sp-core/sp-base/src/main/java/com/pj/constants/UserTypeEnum.java

@@ -0,0 +1,15 @@
+package com.pj.constants;
+
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserTypeEnum {
+    ENTRPRISE_TYPE(3,"商户类型"),
+    PEOPLE_TYPE(1,"边民")
+    ;
+    private Integer code;
+    private String desc;
+}

+ 2 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseController.java

@@ -10,6 +10,7 @@ import cn.hutool.core.date.DateUtil;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.consts.FeignFactory;
 import com.pj.common.core.utils.DateUtils;
+import com.pj.constants.UserTypeEnum;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -173,7 +174,7 @@ public class TbEnterpriseController {
 			return AjaxJson.getSuccess("该商户不存在");
 		}
 		// 如果商户被锁住则禁止app端登录
-		adminInterface.isLock(String.valueOf(t.getId()), Integer.valueOf(t.getType()),0);
+		adminInterface.isLock(String.valueOf(t.getId()), UserTypeEnum.ENTRPRISE_TYPE.getCode(),0);
 		tbEnterprise.setUpdateBy(String.valueOf(loginId));
 		tbEnterpriseService.update(t);
 

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

@@ -10,6 +10,7 @@ import java.util.List;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.constants.UserTypeEnum;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -118,7 +119,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		//保存结果
 		int i = tbPeopleMapper.updateById(tbPeople1);
 		//远程调用停用app user表中的便民账号
-		int lock = adminInterface.isLock(id.toString(), 1, isLock);
+		int lock = adminInterface.isLock(id.toString(), UserTypeEnum.PEOPLE_TYPE.getCode(), isLock);
 		return i == 1 && lock == 1;
 	}