批量会员导入

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

@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
  * @data 2019/7/8 16:19
  */
 @Service
+@Transactional
 @Slf4j
 public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper, BaseUserMemberExport> {
 
@@ -91,7 +92,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
         InsertBatch(baseUserMemberExports);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void InsertBatch(List<BaseUserMemberExport> baseUserMemberExports) {
         mapper.insertList(baseUserMemberExports);
     }
@@ -99,12 +100,12 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
      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) {
@@ -115,4 +116,8 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
          }
          return baseUserMemberExportDTOS;
      }
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
+     public void updateUserMemberExportDataToLoseEfficacyByPhone(String phone){
+        mapper.updateUserMemberExportDataToLoseEfficacyByPhone(phone);
+     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberExportMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 import tk.mybatis.mapper.common.special.InsertListMapper;
 
@@ -12,4 +13,6 @@ import tk.mybatis.mapper.common.special.InsertListMapper;
  */
 public interface BaseUserMemberExportMapper extends Mapper<BaseUserMemberExport>, InsertListMapper<BaseUserMemberExport> {
 
+
+    void updateUserMemberExportDataToLoseEfficacyByPhone(@Param("phone") String phone);
 }

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

@@ -205,7 +205,7 @@ public class AppPermissionService {
      * @param headimgurl
      * @param mobilecode
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public JSONObject register(String username, String password, String headimgurl,
                                String nickname, String mobilecode, String openId, String unionid, Integer type) {
         // 判断参数和验证码
@@ -849,14 +849,16 @@ public class AppPermissionService {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void  insertUserMemberByUserIdAndPhone(Integer userId,String phone) throws Exception {
         List<BaseUserMemberExportDTO> memberExportDTOS = baseUserMemberExportBiz.findUserMemberExportDataByPhoneAndHashEffective(phone);
         if (CollectionUtils.isNotEmpty(memberExportDTOS)){
             insertUserMemberByExistUserMemberExportData(userId,memberExportDTOS);
+            baseUserMemberExportBiz.updateUserMemberExportDataToLoseEfficacyByPhone(phone);
         }
-
     }
 
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
    public void insertUserMemberByExistUserMemberExportData(Integer userId, List<BaseUserMemberExportDTO> userMemberExportDTOS) throws Exception {
         UserMemberDTO userMemberDTO;
        for (BaseUserMemberExportDTO userMemberExportDTO : userMemberExportDTOS) {
@@ -882,7 +884,7 @@ public class AppPermissionService {
         String data = JSONObject.parseObject(ipAddress).getString(IPAddress.BASE_DATA);
         JSONObject ipJsonObject = JSONObject.parseObject(data);
         String cityName = ipJsonObject.getString(IPAddress.CITY_NAME);
-        RegionDTO regionDTO = regionFeign.getRegionByCityName(cityName);
+        RegionDTO regionDTO = regionFeign.getRegionByCityName(StringUtils.isEmpty(cityName)?"东莞":cityName);
         if (null!=regionDTO){
             appUserDetail.setProvinceCode(Integer.valueOf(String.valueOf(regionDTO.getParentId())));
             appUserDetail.setCityCode(Integer.valueOf(String.valueOf(regionDTO.getId())));

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberExportMapper.xml

@@ -11,4 +11,8 @@
         <result property="isDel" column="is_del"/>
         <result property="status" column="status"/>
     </resultMap>
+
+    <update id="updateUserMemberExportDataToLoseEfficacyByPhone">
+        update `base_user_member_export` set `status`=1 where `username`=#{phone}
+    </update>
 </mapper>
\ No newline at end of file