城市运营

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/StudentStatusServiceImpl.java

@@ -1,28 +1,16 @@
 package io.renren.modules.qyh.service.impl;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
 import io.renren.common.canstant.QueueConstant;
 import io.renren.common.enums.AuditCodeEnum;
 import io.renren.common.enums.AuditStatusEnum;
@@ -31,10 +19,10 @@ import io.renren.common.enums.YnEnum;
 import io.renren.common.exception.RRException;
 import io.renren.common.utils.Constant;
 import io.renren.common.utils.PageUtils;
-import io.renren.modules.qmgj.entity.AreaInfoEntity;
 import io.renren.modules.qmgj.entity.MemberInfoEntity;
-import io.renren.modules.qmgj.service.AreaInfoService;
 import io.renren.modules.qmgj.service.MemberInfoService;
+import io.renren.modules.qmjz.entity.Region;
+import io.renren.modules.qmjz.service.RegionService;
 import io.renren.modules.qmjz.utils.BeanCopyUtils;
 import io.renren.modules.qyh.entity.AuditEntity;
 import io.renren.modules.qyh.entity.StudentStatusEntity;
@@ -45,6 +33,16 @@ import io.renren.modules.qyh.model.vo.StudentStatusVO;
 import io.renren.modules.qyh.service.AuditService;
 import io.renren.modules.qyh.service.LoginVerificationService;
 import io.renren.modules.qyh.service.StudentStatusService;
+import org.springframework.amqp.core.MessageProperties;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 无界学院-学籍认证
@@ -60,7 +58,7 @@ public class StudentStatusServiceImpl extends ServiceImpl<StudentStatusMapper, S
     @Autowired
     private AuditService auditService;
     @Autowired
-    private AreaInfoService areaInfoService;
+    private RegionService regionService;
     @Autowired
     private MemberInfoService memberInfoService;
     @Autowired
@@ -117,16 +115,16 @@ public class StudentStatusServiceImpl extends ServiceImpl<StudentStatusMapper, S
 
     private void setRegion(StudentStatusVO studentStatusVO, Long province, Long city, Long area) {
         if (ObjectUtil.isNotNull(province)) {
-            AreaInfoEntity areaInfoEntity = areaInfoService.loadByAreaId(province, true);
-            studentStatusVO.setProvinceStr(areaInfoEntity.getAreaname());
+            Region region = regionService.loadById(province, true);
+            studentStatusVO.setProvinceStr(region.getName());
         }
         if (ObjectUtil.isNotNull(city)) {
-            AreaInfoEntity areaInfoEntity = areaInfoService.loadByAreaId(city, true);
-            studentStatusVO.setCityStr(areaInfoEntity.getAreaname());
+            Region region = regionService.loadById(city, true);
+            studentStatusVO.setCityStr(region.getName());
         }
         if (ObjectUtil.isNotNull(area)) {
-            AreaInfoEntity areaInfoEntity = areaInfoService.loadByAreaId(area, false);
-            studentStatusVO.setAreaStr(areaInfoEntity.getAreaname());
+            Region region = regionService.loadById(area, false);
+            studentStatusVO.setAreaStr(region.getName());
         }
     }
 
@@ -234,14 +232,14 @@ public class StudentStatusServiceImpl extends ServiceImpl<StudentStatusMapper, S
     public String getRegion(StudentStatusEntity statusEntity) {
         Long province = statusEntity.getProvince();
         Long city = statusEntity.getCity();
-        AreaInfoEntity provinceEntity = areaInfoService.loadByAreaId(province, false);
-        AreaInfoEntity cityEntity = areaInfoService.loadByAreaId(city, false);
+        Region provinceEntity = regionService.loadById(province, false);
+        Region cityEntity = regionService.loadById(city, false);
         String region = "";
         if (ObjectUtil.isNotNull(provinceEntity)) {
-            region = region + provinceEntity.getAreaname();
+            region = region + provinceEntity.getName();
         }
         if (ObjectUtil.isNotNull(cityEntity)) {
-            region = region + cityEntity.getAreaname();
+            region = region + cityEntity.getName();
         }
         return region;
     }