From 7af874b92d3081d3a699657e29aa7cae9880aabd Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 17 一月 2022 15:22:58 +0800
Subject: [PATCH] 商业街新增批量上传

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml                |    6 +++---
 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java |   20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml
index 660537a..d207e32 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml
@@ -104,19 +104,19 @@
             (SELECT IF(SUM(coins) IS NULL,0,SUM(coins)) FROM mcs_game t1
             LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
             LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
-            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.allocation = 1 AND t2.is_del = 0 AND t3.`status` = 1)  AS randomCoinTotal,
+            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t1.allocation = 1 AND t2.is_del = 0 AND t3.`status` = 1)  AS randomCoinTotal,
 
             (SELECT IF(SUM(t1.coins * t1.coupons) IS NULL,0,SUM(t1.coins * t1.coupons)) FROM mcs_game t1
             LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
             LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
-            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.allocation = 2 AND t2.is_del = 0 AND t3.`status` = 1)  AS averageCoinTotal,
+            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t1.allocation = 2 AND t2.is_del = 0 AND t3.`status` = 1)  AS averageCoinTotal,
 
             (SELECT IF(SUM(coin) IS NULL,0,SUM(coin)) FROM mcs_coupon WHERE to_days(created_at) = to_days(now())) AS appliedTotal,
 
             (SELECT COUNT(t1.id) FROM mcs_game t1
             LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
             LEFT JOIN sys_user t3 ON t2.user_id = t3.user_id
-            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t2.is_del = 0 AND t3.`status` = 1) AS gameTotal,
+            WHERE t1.is_del = 0 AND t1.`status` = 2 AND t1.expire_at &gt; NOW() AND t2.is_del = 0 AND t3.`status` = 1) AS gameTotal,
 
             (SELECT COUNT(t1.id) FROM mcs_information t1
             LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java
index 6c4314c..299d6f0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java
@@ -183,7 +183,25 @@
 
     @ApiOperation(value = "上传文件")
     @PostMapping(value = "/upload/file", consumes = "multipart/*", headers = "content-type=multipart/form-date")
-    public R uploadImage(@RequestParam MultipartFile[] file, HttpServletRequest request) {
+    public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+        try {
+            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+            sftp.login();
+            InputStream is = file.getInputStream();
+            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+            sftp.logout();
+            return R.ok(url + "/idcard/" + name);
+        } catch (Exception e) {
+            log.error("上传照片失败【{}】", e.getMessage());
+            return R.fail();
+        }
+    }
+
+    @ApiOperation(value = "上传文件-可批量")
+    @PostMapping(value = "/upload/files", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+    public R uploadFiles(@RequestParam MultipartFile[] file, HttpServletRequest request) {
         List<UploadFilesVO> urlList = new ArrayList<>();
         SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
         sftp.login();

--
Gitblit v1.7.1