|
@@ -16,13 +16,17 @@ import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
|
|
|
import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
|
|
|
import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TenantActivationCode;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.TenantAlbum;
|
|
|
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.entity.UserOrder;
|
|
|
import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.TenantAlbumPurchaseService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.TenantAlbumService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.TenantStaffService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.UserOrderService;
|
|
|
import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
|
|
|
import com.yonge.cooleshow.common.controller.BaseController;
|
|
|
import com.yonge.cooleshow.common.entity.HttpResponseResult;
|
|
@@ -85,6 +89,10 @@ public class TenantActivationCodeController extends BaseController {
|
|
|
private TenantStaffService tenantStaffService;
|
|
|
@Autowired
|
|
|
private OssPluginContext ossPluginContext;
|
|
|
+ @Autowired
|
|
|
+ private UserOrderService userOrderService;
|
|
|
+ @Autowired
|
|
|
+ private TenantAlbumService tenantAlbumService;
|
|
|
|
|
|
@ApiOperation(value = "详情", notes = "机构激活码-根据详情ID查询单条, 传入id")
|
|
|
// @GetMapping("/detail/{id}")
|
|
@@ -216,7 +224,14 @@ public class TenantActivationCodeController extends BaseController {
|
|
|
List<TenantActivationCodeWrapper.ExportTemplate> templates = JSONArray.parseArray(JSON.toJSONString(rows), TenantActivationCodeWrapper.ExportTemplate.class);
|
|
|
templates.forEach(next->next.setActivationPhone(""));
|
|
|
|
|
|
- TenantActivationCodeWrapper.ExportFile exportFile = generateExportExcelFile(templates, TenantActivationCodeWrapper.ExportTemplate.class, "激活码导出", "激活码");
|
|
|
+ TenantAlbumPurchase tenantAlbumPurchase = tenantAlbumPurchaseService.getById(Long.valueOf(orderNo));
|
|
|
+ TenantAlbum tenantAlbum = tenantAlbumService.getById(tenantAlbumPurchase.getTenantAlbumId());
|
|
|
+ UserOrder userOrder = userOrderService.getByOrderNo(tenantAlbumPurchase.getOrderNo());
|
|
|
+
|
|
|
+ String format = new SimpleDateFormat("yyyyMMddHHmm").format(userOrder.getCreateTime());
|
|
|
+
|
|
|
+ TenantActivationCodeWrapper.ExportFile exportFile = generateExportExcelFile(templates,
|
|
|
+ TenantActivationCodeWrapper.ExportTemplate.class, format + tenantAlbum.getName(), "激活码");
|
|
|
return succeed(exportFile);
|
|
|
}
|
|
|
|