From 34e5974befc70d4f6e10b4af835d94b8ec6f177e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 14 十一月 2022 02:02:40 +0800
Subject: [PATCH] 优化折扣

---
 service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java b/service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java
index 22850f4..837a0ef 100644
--- a/service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java
+++ b/service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java
@@ -27,7 +27,7 @@
 @Java110Cmd(serviceCode = "export.exportData")
 public class ExportDataCmd extends Cmd {
 
-    private static final String EXPORT_DATA_PRE = "hc/temp/export/data/";
+    private static final String EXPORT_DATA_PRE = "temp/export/data/";
 
     public static final String CODE_PREFIX_ID = "10";
 
@@ -48,6 +48,7 @@
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
         String userId = context.getReqHeaders().get("user-id");
+        String storeId = context.getReqHeaders().get("store-id");
 
         UserDto userDto = new UserDto();
         userDto.setUserId(userId);
@@ -55,12 +56,17 @@
 
         Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
 
+        //杩欓噷鏀惧叆 鍛樺伐ID 鍜�  鍟嗘埛ID
+
+        reqJson.put("userId",userId);
+        reqJson.put("storeId",storeId);
+
         ExportDataDto exportDataDto = new ExportDataDto();
         exportDataDto.setBusinessAdapt(reqJson.getString("pagePath"));
         exportDataDto.setReqJson(reqJson);
-        String fileName = DateUtil.getyyyyMMddhhmmssDateString()
+        String fileName = GenerateCodeFactory.getUUID()
                 + ".xlsx";
-        exportDataDto.setFileName(exportDataDto
+        exportDataDto.setFileName(EXPORT_DATA_PRE
                 + reqJson.getString("pagePath")
                 + "/"
                 + DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)
@@ -70,7 +76,7 @@
         UserDownloadFilePo userDownloadFilePo = new UserDownloadFilePo();
         userDownloadFilePo.setDownloadId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         userDownloadFilePo.setDownloadUserId(userId);
-        userDownloadFilePo.setDownloadUserName(userDtos.get(0).getUserName());
+        userDownloadFilePo.setDownloadUserName(userDtos.get(0).getName());
         userDownloadFilePo.setFileType(reqJson.getString("pagePath"));
         userDownloadFilePo.setCommunityId(reqJson.getString("communityId"));
         userDownloadFilePo.setName(fileName);

--
Gitblit v1.8.0