|
@@ -53,8 +53,6 @@ import java.util.List;
|
|
|
@RequestMapping("${app-config.url.tenant:}/tenantActivationCode")
|
|
|
@Api(tags = "机构激活码")
|
|
|
public class TenantActivationCodeController extends BaseController {
|
|
|
-
|
|
|
-
|
|
|
@Autowired
|
|
|
private TenantActivationCodeService tenantActivationCodeService;
|
|
|
|
|
@@ -134,7 +132,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("请登录");
|
|
@@ -145,6 +143,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 =
|