1.更新导入激活码异常数据返回结构

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantActivationCodeService.java

@@ -1,11 +1,13 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
 import com.yonge.cooleshow.biz.dal.entity.TenantActivationCode;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.utils.easyexcel.ExcelDataReaderProperty;
 
 import java.util.List;
@@ -72,8 +74,8 @@ public interface TenantActivationCodeService extends IService<TenantActivationCo
      * @param userId                机构管理员用户ID
      * @param tenantAlbumPurchaseId 专辑购买的ID
      */
-    void importActiveCode(List<ExcelDataReaderProperty<TenantActivationCodeWrapper.ImportTemplate>> dataList,
-                          Long tenantId, Long userId, Long tenantAlbumPurchaseId);
+    HttpResponseResult<Object> importActiveCode(List<ExcelDataReaderProperty<TenantActivationCodeWrapper.ImportTemplate>> dataList,
+                                                    Long tenantId, Long userId, Long tenantAlbumPurchaseId);
 
     void activeById(String id, Long userId);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.domain.NextUrl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,6 +29,7 @@ import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.EActivationCode;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -383,8 +385,8 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void importActiveCode(List<ExcelDataReaderProperty<TenantActivationCodeWrapper.ImportTemplate>> dataList,
-                                 Long tenantId, Long userId, Long tenantAlbumPurchaseId) {
+    public HttpResponseResult<Object> importActiveCode(List<ExcelDataReaderProperty<TenantActivationCodeWrapper.ImportTemplate>> dataList,
+                                                           Long tenantId, Long userId, Long tenantAlbumPurchaseId) {
         if (dataList.isEmpty()) {
             throw new BizException("未解析到数据");
         }
@@ -487,7 +489,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
             if (!code_send_lines.isEmpty()) {
                 StringBuilder err = new StringBuilder("");
                 String errLines = code_send_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                err.append("第").append(errLines).append("行错误，").append(errLines).append(code_send);
+                err.append("第").append(errLines).append("行错误，").append(code_send);
                 errData.add(err.toString());
             }
 
@@ -508,7 +510,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 err.append(String.join(",", lineErr)).append("行错误，").append(code_repeat);
                 errData.add(err.toString());
             }
-            throw new BizException(errMsg.toString(), errData);
+            return HttpResponseResult.failed(500, errData,errMsg.toString());
         }
 
 
@@ -533,6 +535,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
             throw new BizException("没有合法的导入数据");
         }
         this.updateBatchById(tenantActivationCodes, 50);
+        return HttpResponseResult.succeed();
     }
 
     private void addUserTenantAlbumRecord(Long studentId, TenantAlbumPurchase purchase,

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -292,7 +292,7 @@ public class TenantActivationCodeController extends BaseController {
 
     @PostMapping("/importActiveCode")
     @ApiOperation(value = "导入", notes = "传入file")
-    public HttpResponseResult<List<ErrMsg>> importActiveCode(
+    public HttpResponseResult<Object> importActiveCode(
             @RequestParam("file") MultipartFile file,
             @RequestParam("tenantAlbumPurchaseId") Long tenantAlbumPurchaseId) {
         if (null == file) {
@@ -310,11 +310,10 @@ public class TenantActivationCodeController extends BaseController {
         try {
             ExcelDataReader<TenantActivationCodeWrapper.ImportTemplate> reader =
                     ExcelUtils.getReader(TenantActivationCodeWrapper.ImportTemplate.class, file);
-            tenantActivationCodeService.importActiveCode(reader.getDataList(), user.getTenantId(), user.getId(),
+            return tenantActivationCodeService.importActiveCode(reader.getDataList(), user.getTenantId(), user.getId(),
                     tenantAlbumPurchaseId);
-            return HttpResponseResult.succeed();
-        } catch (ExcelException e) {
-            log.error("导入激活码失败:"+JSON.toJSONString(e.getErrMsgList()));
+        } catch (Exception e) {
+            log.error("导入激活码失败:"+JSON.toJSONString(e.getMessage()));
             return HttpResponseResult.failed("文件解析错误");
         }
     }