修改bug

liujie

10 天以前 c196e41a7c9f2bd845d189486069c416eca9c968

修改bug

 ruoyi-admin/pom.xml

@@ -66,6 +66,11 @@
            <artifactId>ruoyi-generator</artifactId>
        </dependency>

        <dependency>
            <groupId>com.aliyun.oss</groupId>
            <artifactId>aliyun-sdk-oss</artifactId>
            <version>3.15.1</version>
        </dependency>
    </dependencies>

    <build>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UploadController.java

New file
@@ -0,0 +1,60 @@
package com.ruoyi.web.controller.system;

import com.aliyun.oss.OSSClient;
import com.aliyun.oss.model.ObjectMetadata;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;

@Slf4j
@RestController
@RequestMapping("/upload")
@Api(tags = "上传")
public class UploadController {
    @ApiOperation(value = "文件上传",notes="文件上传")
    @PostMapping("/uploadFile")
    @ResponseBody
    public R<String> upload(HttpServletRequest request, @RequestPart("file") MultipartFile picture) {
        String filePath="";
        try {
            filePath = ossUpload(request,picture);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return R.ok(filePath);
    }

    public static String oss_domain = "https://yizhengcheng.oss-cn-chengdu.aliyuncs.com/";
    public static String accessKeyId = "LTAI5tHYSpwifc3rqLYJoETo";
    public static String accessKeySecret = "xrDyQ89h8P0alWW7rrLIW2D2rt7Eig";
    public static String bucketName="yizhengcheng";
    public static String endpoint = "oss-cn-chengdu.aliyuncs.com";


    public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException {
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);

        String fileName = "";
        if (file != null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename() != null) {
            InputStream content = file.getInputStream();//获得指定文件的输入流
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            String originalFilename = file.getOriginalFilename();
            fileName = UUID.randomUUID().toString().replaceAll("-", "") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            ossClient.putObject(bucketName, "img/" + fileName, content, meta);// 上传Object.
            if (fileName != null && !"".equals(fileName)) {
                fileName = oss_domain + "img/" + fileName;
            }
        }
        return fileName;
    }
}

 ruoyi-common/pom.xml

@@ -168,11 +168,7 @@
            <artifactId>easypoi-annotation</artifactId>
            <version>4.4.0</version>
        </dependency>
        <dependency>
            <groupId>com.aliyun.oss</groupId>
            <artifactId>aliyun-sdk-oss</artifactId>
            <version>3.15.1</version>
        </dependency>

    </dependencies>

</project>

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/OSSUtil.java

File was deleted

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/OssUploadUtil.java

New file
@@ -0,0 +1,87 @@
//package com.ruoyi.common.utils.file;
//
//import com.aliyun.oss.OSSClient;
//import com.aliyun.oss.model.ObjectMetadata;
//import org.springframework.web.multipart.MultipartFile;
////
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//import java.io.InputStream;
//import java.util.UUID;
//
//public class OssUploadUtil {
//    public static String oss_domain = "https://yizhengcheng.oss-cn-chengdu.aliyuncs.com/";
//    public static String accessKeyId = "LTAI5tHYSpwifc3rqLYJoETo";
//    public static String accessKeySecret = "xrDyQ89h8P0alWW7rrLIW2D2rt7Eig";
//    public static String bucketName="yizhengcheng";
//    public static String endpoint = "oss-cn-chengdu.aliyuncs.com";
//
//
//    public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException {
//        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
//        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
//
//        String fileName = "";
//        if (file != null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename() != null) {
//            InputStream content = file.getInputStream();//获得指定文件的输入流
//            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
//            meta.setContentLength(file.getSize());  // 必须设置ContentLength
//            String originalFilename = file.getOriginalFilename();
//            fileName = UUID.randomUUID().toString().replaceAll("-", "") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
//            ossClient.putObject(bucketName, "img/" + fileName, content, meta);// 上传Object.
//            if (fileName != null && !"".equals(fileName)) {
//                fileName = oss_domain + "img/" + fileName;
//            }
//        }
//        return fileName;
//    }
//
//
//
//    //上传图片
//
//    /**
//     * 通过文件名判断并获取OSS服务文件上传时文件的contentType
//     *
//     * @param fileName
//     *            文件名
//     * @return 文件的contentType
//     */
//    public static String getContentType(String fileName) {
//        // 文件的后缀名
//        String fileExtension = fileName.substring(fileName.lastIndexOf("."));
//        if (".bmp".equalsIgnoreCase(fileExtension)) {
//            return "image/bmp";
//        }
//        if (".gif".equalsIgnoreCase(fileExtension)) {
//            return "image/gif";
//        }
//        if (".jpeg".equalsIgnoreCase(fileExtension) || ".jpg".equalsIgnoreCase(fileExtension)
//                || ".png".equalsIgnoreCase(fileExtension)) {
//            return "image/jpeg";
//        }
//        if (".html".equalsIgnoreCase(fileExtension)) {
//            return "text/html";
//        }
//        if (".txt".equalsIgnoreCase(fileExtension)) {
//            return "text/plain";
//        }
//        if (".vsd".equalsIgnoreCase(fileExtension)) {
//            return "application/vnd.visio";
//        }
//        if (".ppt".equalsIgnoreCase(fileExtension) || "pptx".equalsIgnoreCase(fileExtension)) {
//            return "application/vnd.ms-powerpoint";
//        }
//        if (".doc".equalsIgnoreCase(fileExtension) || "docx".equalsIgnoreCase(fileExtension)) {
//            return "application/msword";
//        }
//        if (".xml".equalsIgnoreCase(fileExtension)) {
//            return "text/xml";
//        }
//        if (".mp4".equalsIgnoreCase(fileExtension)) {
//            return "video/mp4";
//        }
//        // 默认返回类型
//        return "image/jpeg";
//    }
//}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java

@@ -123,6 +123,7 @@
        accountDetail.setUserId(dto.getId());
        accountDetail.setType(dto.getType());
        accountDetail.setMoney(dto.getMoney());
        accountDetail.setCategory(5);
        accountDetail.setRemark(dto.getRemark());
        accountDetailMapper.insert(accountDetail);
        //修改用户余额

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java

@@ -20,6 +20,7 @@
import com.ruoyi.system.pojo.dto.OrderPageDTO;
import com.ruoyi.system.pojo.model.DailyStatistics;
import com.ruoyi.system.pojo.vo.*;
import com.ruoyi.system.service.CompanyTypeService;
import com.ruoyi.system.service.OrderService;
import com.ruoyi.system.wx.RefundCallbackResult;
import com.ruoyi.system.wx.WechatPayService;
@@ -63,6 +64,9 @@
    private RedisCache redisCache;
    @Resource
    private QichachaMapper qichachaMapper;

    @Resource
    private CompanyTypeService companyTypeService;


    @Override
@@ -163,6 +167,9 @@
        BeanUtils.copyProperties(company, vo);
        vo.setPlace(company.getCity()+company.getProvince()+company.getArea());

        String name = companyTypeService.getById(company.getCompanyCategory()).getName();
        vo.setCompanyCategoryName(name);

        //todo 再查企业工商信息 覆盖掉之前的



 ruoyi-system/src/main/resources/mapper/system/OrderMapper.xml

@@ -83,8 +83,9 @@
            -- 匹配映射后的状态3（c.status=4且o.status=3）
            OR (c.status = 4 AND o.status = 3 AND 3 = #{dto.status})
            )
        order by c.create_time,o.create_time
        </if>
        order by c.create_time desc

    </select>
    <select id="getDetailById" resultType="com.ruoyi.system.pojo.vo.OrderDetailVO">


 ruoyi-system/src/main/resources/mapper/system/WithdrawMapper.xml

@@ -28,5 +28,6 @@
                and w.status = #{dto.status}
            </if>
        </where>
        order by w.create_time desc
    </select>
</mapper>