批量会员导入

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserMemberExportDTO.java

@@ -22,13 +22,10 @@ import java.io.Serializable;
 @Table(name = "base_user_member_export")
 public class BaseUserMemberExportDTO implements Serializable {
     private static final long serialVersionUID = 1L;
-    private Integer id;
     private String username;
     private Integer memberLevel;
     private Integer totalNumber;
     private Integer rentFreeDays;
     private Integer discount;
     private Integer status;
-    private Integer isDel;
-
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
+import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,6 +63,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                 userMemberDTO.setDiscount(levelAndDisCountMap==null?0:(levelAndDisCountMap.get(Integer.valueOf(memberLevel))==null?0:levelAndDisCountMap.get(Integer.valueOf(memberLevel))));
                 userMemberDTO.setTotalNumber(Integer.valueOf(totalNumber));
                 userMemberDTO.setRentFreeDays(Integer.valueOf(rentFreeDays));
+                userMemberDTO.setIsBind(1);
                 try {
                     baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
                 } catch (Exception e) {
@@ -90,4 +95,24 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     public void InsertBatch(List<BaseUserMemberExport> baseUserMemberExports) {
         mapper.insertList(baseUserMemberExports);
     }
+
+     public List<BaseUserMemberExportDTO> findUserMemberExportDataByPhoneAndHashEffective(String phone){
+         List<BaseUserMemberExportDTO> baseUserMemberExportDTOS  = new ArrayList<>();
+
+       //  BaseUserMemberExport baseUserMemberExport = new BaseUserMemberExport();
+         Example example = new Example(BaseUserMemberExport.class);
+         Example.Criteria criteria = example.createCriteria();
+         criteria.andEqualTo("username",phone);
+         criteria.andEqualTo("status",0);
+         List<BaseUserMemberExport> baseUserMemberExports = mapper.selectByExample(example);
+         if (CollectionUtils.isNotEmpty(baseUserMemberExports)){
+                  BaseUserMemberExportDTO baseUserMemberExportDTO;
+             for (BaseUserMemberExport userMemberExport : baseUserMemberExports) {
+                 baseUserMemberExportDTO = new BaseUserMemberExportDTO();
+                 BeanUtils.copyProperties(userMemberExport,baseUserMemberExportDTO);
+                 baseUserMemberExportDTOS.add(baseUserMemberExportDTO);
+             }
+         }
+         return baseUserMemberExportDTOS;
+     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -8,6 +8,8 @@ import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
 import com.github.wxiaoqi.security.admin.biz.ElementBiz;
 import com.github.wxiaoqi.security.admin.constant.RedisKey;
 import com.github.wxiaoqi.security.admin.constant.enumerate.UserSourceEnum;
+import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
+import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
@@ -26,11 +28,13 @@ import com.xxfc.platform.universal.dto.RegionDTO;
 import com.xxfc.platform.universal.feign.RegionFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.RequestAttributes;
@@ -49,6 +53,7 @@ import java.util.concurrent.TimeUnit;
  * @author keliii
  */
 @Service
+@Transactional
 @Slf4j
 public class AppPermissionService {
 
@@ -84,6 +89,12 @@ public class AppPermissionService {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private BaseUserMemberExportBiz baseUserMemberExportBiz;
+
+    @Autowired
+    private BaseUserMemberBiz baseUserMemberBiz;
+
 
 
 
@@ -238,6 +249,9 @@ public class AppPermissionService {
             appUserLogin.setUpdatetime(now);
             appUserLoginBiz.insertSelective(appUserLogin);
             Integer userid = appUserLogin.getId();
+
+            insertUserMemberByUserIdAndPhone(userid,username);
+
             log.error("注册：新增登陆用户信息： " + userid);
             // 新增用户详情
             AppUserDetail rsUserDetail = new AppUserDetail();
@@ -401,6 +415,7 @@ public class AppPermissionService {
                         userDetail.setCrtHost(getIp());
                         setCreateIPInfo(userDetail);
                         appUserDetailBiz.insertSelective(userDetail);
+
                     } /*else {
                         userDetail.setId(userVo.getId());
                         userDetail.setHeadimgurl(headimgurl);
@@ -748,6 +763,9 @@ public class AppPermissionService {
             appUserLogin.setUpdatetime(now);
             appUserLoginBiz.insertSelective(appUserLogin);
             Integer userid = appUserLogin.getId();
+
+             insertUserMemberByUserIdAndPhone(userid,username);
+
             log.error("注册：新增登陆用户信息： " + userid);
             // 新增用户详情
             AppUserDetail rsUserDetail = new AppUserDetail();
@@ -807,6 +825,7 @@ public class AppPermissionService {
      * @param username
      * @return
      */
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public JSONObject appletRegistry(String username,String headimgurl,String nickname,Integer small_id){
 
         try {
@@ -830,6 +849,28 @@ public class AppPermissionService {
         }
     }
 
+    public void  insertUserMemberByUserIdAndPhone(Integer userId,String phone) throws Exception {
+        List<BaseUserMemberExportDTO> memberExportDTOS = baseUserMemberExportBiz.findUserMemberExportDataByPhoneAndHashEffective(phone);
+        if (CollectionUtils.isNotEmpty(memberExportDTOS)){
+            insertUserMemberByExistUserMemberExportData(userId,memberExportDTOS);
+        }
+
+    }
+
+   public void insertUserMemberByExistUserMemberExportData(Integer userId, List<BaseUserMemberExportDTO> userMemberExportDTOS) throws Exception {
+        UserMemberDTO userMemberDTO;
+       for (BaseUserMemberExportDTO userMemberExportDTO : userMemberExportDTOS) {
+            userMemberDTO = new UserMemberDTO();
+            userMemberDTO.setUserId(userId);
+            userMemberDTO.setRentFreeDays(userMemberExportDTO.getRentFreeDays());
+            userMemberDTO.setMemberLevel(userMemberExportDTO.getMemberLevel());
+            userMemberDTO.setTotalNumber(userMemberExportDTO.getTotalNumber());
+            userMemberDTO.setDiscount(userMemberExportDTO.getDiscount());
+            userMemberDTO.setIsBind(1);
+           baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
+       }
+   }
+
     /**
      * ip地址 信息解析
      * @param appUserDetail
@@ -838,13 +879,8 @@ public class AppPermissionService {
 
         String crtHost = appUserDetail.getCrtHost();
         String ipAddress = restTemplate.getForObject(String.format("%s%s", IPAddress.BASE_IP_PARSING_URL, crtHost), String.class);
-        log.info("----setCreateIPInfo--crtHost========"+crtHost);
         String data = JSONObject.parseObject(ipAddress).getString(IPAddress.BASE_DATA);
         JSONObject ipJsonObject = JSONObject.parseObject(data);
-//        Integer provinceCode = ipJsonObject.getInteger(IPAddress.PROVINCE_CODE);
-//        Integer cityCode = ipJsonObject.getInteger(IPAddress.CITY_CODE);
-        //appUserLogin.setProvinceCode(provinceCode);
-        //appUserLogin.setCityCode(cityCode);
         String cityName = ipJsonObject.getString(IPAddress.CITY_NAME);
         RegionDTO regionDTO = regionFeign.getRegionByCityName(cityName);
         if (null!=regionDTO){

xx-common/xx-common-platform-component/pom.xml

@@ -15,12 +15,25 @@
           <swagger.version>2.9.2</swagger.version>
       </properties>
      <dependencies>
+
+         <dependency>
+             <groupId>com.github.wxiaoqi</groupId>
+             <artifactId>ace-admin-api</artifactId>
+             <version>2.0-SNAPSHOT</version>
+         </dependency>
+
          <dependency>
              <groupId>org.springframework.cloud</groupId>
              <artifactId>spring-cloud-starter-openfeign</artifactId>
              <scope>provided</scope>
          </dependency>
 
+         <dependency>
+             <groupId>org.springframework.boot</groupId>
+             <artifactId>spring-boot-starter-data-redis</artifactId>
+             <scope>provided</scope>
+         </dependency>
+
          <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-configuration-processor -->
          <dependency>
              <groupId>org.springframework.boot</groupId>

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -17,16 +17,16 @@ import java.util.List;
 @FeignClient(name = "vehicle")
 public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
-    public ObjectRestResponse<VehicleModel> get(@PathVariable("id") int id);
+    public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
 
     @GetMapping(value = "/vehicleInfo/{id}")
-    public ObjectRestResponse<Vehicle> get(@PathVariable("id") String id);
+    public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)
-    public RestResponse<Vehicle> findById(@RequestParam("id")String id);
+    public RestResponse<Vehicle> findById(@RequestParam(value = "id")String id);
 
     @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
-    public RestResponse< List<Vehicle>> getByIds(@RequestParam("ids") List<String> id);
+    public RestResponse< List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
 
     //修改评分
     @RequestMapping(value = "/vehicleModel/app/addScore", method = RequestMethod.GET)
@@ -36,19 +36,19 @@ public interface VehicleFeign {
     public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
 
     @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
-    public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);
+    public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable(value = "id") Integer id);
 
     //租车拒绝预约
     @RequestMapping(value = "/vehicleInfo/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
-    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable Long bookRecordId);
+    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //取消预约
     @RequestMapping(value = "/vehicleInfo/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
-    public RestResponse<Integer> unbookVehicle(@PathVariable Long bookRecordId);
+    public RestResponse<Integer> unbookVehicle(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //通过预约
     @RequestMapping(value = "/vehicleInfo/book/4employee/prove/{bookRecordId}", method = RequestMethod.PUT)
-    public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId);
+    public RestResponse<Integer> proveVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //获取分公司列表
     @GetMapping("/branchCompany/all")