Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -272,6 +272,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         for (List<String> codes : codePartition) {
             List<TenantActivationCode> activationCodes = this.lambdaQuery()
                     .eq(TenantActivationCode::getTenantId, tenantId)
+                    .eq(TenantActivationCode::getTenantAlbumPurchaseId, tenantAlbumPurchaseId)
                     .in(TenantActivationCode::getActivationCode, codes).list();
 
             // 存在无效码或者已经使用过的码
@@ -289,11 +290,15 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 }
             }
 
-            activationCodes.forEach(next -> {
+            List<TenantActivationCode> updateDataList = activationCodes.stream().map(next -> {
+                TenantActivationCode tenantActivationCode = new TenantActivationCode();
+                tenantActivationCode.setId(next.getId());
                 next.setActivationPhone(codePhoneMap.get(next.getActivationCode()));
                 next.setSendStatus(EActivationCode.SEND);
-            });
-            tenantActivationCodes.addAll(activationCodes);
+                return tenantActivationCode;
+            }).collect(Collectors.toList());
+
+            tenantActivationCodes.addAll(updateDataList);
         }
         if (!errMsg.isEmpty()) {
             throw new BizException(String.join(",", errMsg));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumWrapper.java

@@ -37,10 +37,10 @@ public class TenantAlbumWrapper {
         private Long id;
 
         @ApiModelProperty("当前页")
-        private int page;
+        private Integer page;
 
         @ApiModelProperty("分页行数")
-        private int rows;
+        private Integer rows;
 
         @ApiModelProperty("关键字匹配")
         private String keyword;