Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.common.enums.EActivationCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -48,6 +49,9 @@ public class TenantActivationCodeWrapper {
         @ApiModelProperty("专辑购买ID")
         private Long tenantAlbumPurchaseId;
 
+        @ApiModelProperty("发送状态")
+        private EActivationCode sendStatus;
+
         @ApiModelProperty("激活状态")
         private Boolean activationStatus;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantActivationCodeMapper.xml

@@ -40,6 +40,9 @@
             <if test="param.tenantAlbumPurchaseId != null">
                 AND t.tenant_album_purchase_id_ = #{param.tenantAlbumPurchaseId}
             </if>
+            <if test="param.sendStatus != null">
+                AND t.send_status_ = #{param.sendStatus}
+            </if>
             <if test="param.activationStatus != null">
                 AND t.activation_status_ = #{param.activationStatus}
             </if>

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

@@ -13,6 +13,8 @@ import com.yonge.cooleshow.biz.dal.entity.TenantActivationCode;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbumPurchase;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
 import com.yonge.cooleshow.biz.dal.entity.TenantStaff;
+import com.yonge.cooleshow.biz.dal.enums.SendStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.im.EImSendStatus;
 import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
 import com.yonge.cooleshow.biz.dal.service.TenantAlbumPurchaseService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
@@ -138,7 +140,7 @@ public class TenantActivationCodeController extends BaseController {
 
     @GetMapping("/exportActiveCode")
     @ApiOperation(value = "导出模板")
-    public void exportActiveCode(HttpServletResponse response) {
+    public void exportActiveCode(HttpServletResponse response,String orderNo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("请登录");
@@ -149,6 +151,8 @@ public class TenantActivationCodeController extends BaseController {
                 new TenantActivationCodeWrapper.TenantActivationCodeQuery();
         query.setTenantId(tenantId);
         query.setActivationStatus(false);
+        query.setTenantAlbumPurchaseId(Long.valueOf(orderNo));
+        query.setSendStatus(EActivationCode.WAIT);
         query.setPage(1);
         query.setRows(9999);
         IPage<TenantActivationCodeWrapper.TenantActivationCode> queryInfo =