fix:技师审核调整

nightFragrance-admin/src/main/java/com/ylx/web/controller/common/CommonController.java

@@ -82,56 +82,13 @@ public class CommonController
 
 
 
-    private String calculateMD5(MultipartFile file) throws IOException {
-        byte[] bytes = file.getBytes();
-        return DigestUtil.md5Hex(bytes);
-    }
-
-
-
-
     /**
      * 通用上传请求（单个）
      */
     @ApiOperation("通用上传请求（单个）")
     @PostMapping("/upload")
-    public AjaxResult uploadFile(MultipartFile file) throws Exception
-    {
-        AjaxResult ajax = AjaxResult.success();
-        try
-        {
-            String md5 = calculateMD5(file);
-
-            TbFile dbFile = fileService.getByMd5(md5);
-            if(null != dbFile){
-                ajax.put("url", serverConfig.getUrl() + dbFile.getFileUrl());
-                ajax.put("fileName", dbFile.getFileUrl());
-                ajax.put("newFileName", FileUtils.getName(dbFile.getFileUrl()));
-                ajax.put("originalFilename", dbFile.getFileName());
-                return ajax;
-            }
-
-            // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
-            // 上传并返回新文件名称
-            String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
-            ajax.put("url", url);
-            ajax.put("fileName", fileName);
-            ajax.put("newFileName", FileUtils.getName(fileName));
-            ajax.put("originalFilename", file.getOriginalFilename());
-
-            TbFile tbFile = new TbFile();
-            tbFile.setMd5(md5);
-            tbFile.setFileName(file.getOriginalFilename());
-            tbFile.setFileUrl(fileName);
-            fileService.save(tbFile);
-            return ajax;
-        }
-        catch (Exception e)
-        {
-            return AjaxResult.error(e.getMessage());
-        }
+    public AjaxResult uploadFile(MultipartFile file) throws Exception {
+        return fileService.uploadFile(file);
     }
 
     /**

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WxController.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
+import com.ylx.common.config.RuoYiConfig;
 import com.ylx.common.constant.Constants;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.AjaxResult;
@@ -21,6 +22,9 @@ import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.utils.MessageUtils;
+import com.ylx.common.utils.file.FileUploadUtils;
+import com.ylx.common.utils.file.FileUtils;
+import com.ylx.framework.config.ServerConfig;
 import com.ylx.framework.manager.AsyncManager;
 import com.ylx.framework.manager.factory.AsyncFactory;
 import com.ylx.framework.web.service.WxTokenService;
@@ -28,6 +32,7 @@ import com.ylx.massage.domain.CouponReceive;
 import com.ylx.massage.domain.vo.TWxUserVo;
 import com.ylx.massage.service.CouponReceiveService;
 import com.ylx.massage.service.TCommentService;
+import com.ylx.massage.service.TbFileService;
 import com.ylx.massage.utils.LocationUtil;
 import com.ylx.massage.utils.WxQrCodeUtil;
 import com.ylx.massage.utils.WxUtil;
@@ -43,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -66,6 +72,10 @@ public class WxController extends BaseController {
     @Resource
     private WxUtil wxUtil;
 
+    @Autowired
+    private ServerConfig serverConfig;
+
+
     @Resource
     private WxQrCodeUtil wxQrCodeUtil;
     @Resource
@@ -77,6 +87,9 @@ public class WxController extends BaseController {
     @Autowired
     private WxMaService wxMaService;
 
+    @Autowired
+    private TbFileService tbFileService;
+
     @Autowired
     private CouponReceiveService couponReceiveService;
 
@@ -95,11 +108,12 @@ public class WxController extends BaseController {
 //        String cOpenId = param.getString("cOpenId");
 //        return wxQrCodeUtil.generateQRCode(null,null,null);
 //    }
-    //生成小程序码方式
-    @PostMapping(value="getwxQrCode",produces = MediaType.IMAGE_JPEG_VALUE)
-    public byte[] inviteCode(@RequestParam ("inviteUserId")String inviteUserId) throws WxErrorException {
-        File file=wxMaService.getQrcodeService().createWxaCodeUnlimit(inviteUserId,null,300,true,null,true);
-        return FileUtil.readBytes(file);
+    //生成小程序码方式 ,produces = MediaType.IMAGE_JPEG_VALUE
+    @PostMapping(value="getwxQrCode")
+    public AjaxResult inviteCode(@RequestParam ("inviteUserId")String inviteUserId) throws WxErrorException, IOException {
+        File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(inviteUserId, null, 300, true, null, true);
+        MultipartFile multipartFile = FileUploadUtils.getMultipartFile(file);
+        return tbFileService.uploadFile(multipartFile);
     }
 
     /**

nightFragrance-common/pom.xml

@@ -166,6 +166,15 @@
             <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
             <version>4.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>6.0.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

nightFragrance-common/src/main/java/com/ylx/common/utils/file/FileUploadUtils.java

@@ -1,10 +1,13 @@
 package com.ylx.common.utils.file;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Objects;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.http.entity.ContentType;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import com.ylx.common.config.RuoYiConfig;
 import com.ylx.common.constant.Constants;
@@ -86,6 +89,23 @@ public class FileUploadUtils
         }
     }
 
+
+
+    public static MultipartFile getMultipartFile (File file) {
+//        String path = "export/demo.xlsx";
+//        File file = new File(path);
+        MultipartFile multipartFile;
+        try {
+            FileInputStream fileInputStream = new FileInputStream(file);
+            multipartFile = new MockMultipartFile("copy"+file.getName(),file.getName(), ContentType.APPLICATION_OCTET_STREAM.toString(),fileInputStream);
+            System.out.println(multipartFile.getName()); // 输出demo.xlsx
+            fileInputStream.close();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return multipartFile;
+    }
+
     /**
      * 文件上传
      *

nightFragrance-massage/pom.xml

@@ -43,6 +43,10 @@
             <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>nightFragrance-framework</artifactId>
+        </dependency>
 
     </dependencies>
 </project>

nightFragrance-massage/src/main/java/com/ylx/massage/service/TbFileService.java

@@ -2,7 +2,9 @@ package com.ylx.massage.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ylx.common.core.domain.AjaxResult;
 import com.ylx.massage.domain.TbFile;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * (TbFile)表服务接口
@@ -13,5 +15,7 @@ import com.ylx.massage.domain.TbFile;
 public interface TbFileService extends IService<TbFile> {
 
     TbFile getByMd5(String md5);
+
+    AjaxResult uploadFile(MultipartFile file);
 }
 

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -93,12 +93,13 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean auditing(TJs js) {
+        TJs js1 = this.getById(js.getId());
         LambdaQueryWrapper<TJs> jsLambdaQueryWrapper = new LambdaQueryWrapper<>();
         jsLambdaQueryWrapper.eq(TJs::getId, js.getId()).eq(TJs::getnTong, JsStatusEnum.JS_NOT_PASS.getCode());
         js.setnTong(JsStatusEnum.JS_PASS.getCode());
 
         LambdaQueryWrapper<TWxUser> wxLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        wxLambdaQueryWrapper.eq(TWxUser::getcOpenid, js.getcOpenId());
+        wxLambdaQueryWrapper.eq(TWxUser::getcOpenid, js1.getcOpenId());
         TWxUser tWxUser = new TWxUser();
         tWxUser.setRole(1);
         wxUserService.update(tWxUser, wxLambdaQueryWrapper);

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -224,6 +224,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
     @Transactional(rollbackFor = Exception.class)
     public void orderPayManage(TWxUser user, TOrder orderNew) {
+
+        //删除优惠卷
+
         // 更新用户金额 及下单此时
         TWxUser paramUser = new TWxUser();
         paramUser.setcOpenid(user.getcOpenid());

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TbFileServiceImpl.java

@@ -1,12 +1,22 @@
 package com.ylx.massage.service.impl;
 
+import cn.hutool.crypto.digest.DigestUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.common.config.RuoYiConfig;
+import com.ylx.common.core.domain.AjaxResult;
+import com.ylx.common.utils.file.FileUploadUtils;
+import com.ylx.common.utils.file.FileUtils;
+import com.ylx.framework.config.ServerConfig;
 import com.ylx.massage.domain.TbFile;
 import com.ylx.massage.mapper.TbFileMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ylx.massage.service.TbFileService;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 /**
  * (TbFile)表服务实现类
@@ -17,11 +27,56 @@ import com.ylx.massage.service.TbFileService;
 @Service("tbFileService")
 public class TbFileServiceImpl extends ServiceImpl<TbFileMapper, TbFile> implements TbFileService {
 
+    @Autowired
+    private ServerConfig serverConfig;
     @Override
     public TbFile getByMd5(String md5) {
         LambdaQueryWrapper<TbFile> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TbFile::getMd5,md5);
         return this.getOne(queryWrapper);
     }
+
+    public String calculateMD5(MultipartFile file) throws IOException {
+        byte[] bytes = file.getBytes();
+        return DigestUtil.md5Hex(bytes);
+    }
+    @Override
+    public AjaxResult uploadFile(MultipartFile file) {
+        AjaxResult ajax = AjaxResult.success();
+        try
+        {
+            String md5 = calculateMD5(file);
+
+            TbFile dbFile = this.getByMd5(md5);
+            if(null != dbFile){
+                ajax.put("url", serverConfig.getUrl() + dbFile.getFileUrl());
+                ajax.put("fileName", dbFile.getFileUrl());
+                ajax.put("newFileName", FileUtils.getName(dbFile.getFileUrl()));
+                ajax.put("originalFilename", dbFile.getFileName());
+                return ajax;
+            }
+
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            ajax.put("url", url);
+            ajax.put("fileName", fileName);
+            ajax.put("newFileName", FileUtils.getName(fileName));
+            ajax.put("originalFilename", file.getOriginalFilename());
+
+            TbFile tbFile = new TbFile();
+            tbFile.setMd5(md5);
+            tbFile.setFileName(file.getOriginalFilename());
+            tbFile.setFileUrl(fileName);
+            this.save(tbFile);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
 }