修改bug

mitao

2024-07-15 5814d15a328979d3d97a65a8e6e3e70b5204ca32

修改bug

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java

@@ -154,8 +154,8 @@
    /**
     * 根据优惠券id集合查询订单列表
     *
     * @param couponIdSet 优惠券id集合
     * @param inner       内部调用标志
     * @param couponIds 优惠券id集合
     * @param source       内部调用标志
     * @return List<Order>
     */
    @PostMapping("/order/list-by-coupon")

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -39,6 +39,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -347,6 +348,8 @@
                .in(StringUtils.isNotEmpty(memberIdSet), Article::getMemberId, memberIdSet)
                .eq(StringUtils.isNotNull(query.getListingStatus()), Article::getListingStatus,
                        query.getListingStatus())
                .eq(StringUtils.isNotNull(query.getArticleType()), Article::getArticleType,
                        query.getArticleType())
                .like(StringUtils.isNotBlank(query.getTitle()), Article::getTitle, query.getTitle())
                .orderByDesc(Article::getReported)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
@@ -376,6 +379,10 @@
        Set<Long> memIds = voList.stream().filter(articleVO -> articleVO.getArticleType()
                .equals(ArticleTypeEnum.USER_POSTING)).map(MgtArticleVO::getMemberId).collect(
                Collectors.toSet());
        Set<Long> memIds2 = voList.stream().map(MgtArticleVO::getReportBy).filter(
                Objects::nonNull).map(Long::valueOf).collect(
                Collectors.toSet());
        memIds.addAll(memIds2);
        if (StringUtils.isNotEmpty(memIds)) {
            List<Member> memberList = memberClient.getMemberListByIds(memIds,
                    SecurityConstants.INNER).getData();
@@ -384,7 +391,7 @@
        } else {
            memberMap = null;
        }
        if (StringUtils.isNotNull(userMap)) {
        if (StringUtils.isNotEmpty(userMap)) {
            voList.stream().filter(articleVO -> articleVO.getArticleType()
                    .equals(ArticleTypeEnum.PLATFORM_RELEASE)).forEach(articleVO -> {
                SysUser sysUser = userMap.get(Long.valueOf(articleVO.getCreateBy()));
@@ -394,7 +401,7 @@
                }
            });
        }
        if (StringUtils.isNotNull(memberMap)) {
        if (StringUtils.isNotEmpty(memberMap)) {
            voList.stream().filter(articleVO -> articleVO.getArticleType()
                    .equals(ArticleTypeEnum.USER_POSTING)).forEach(articleVO -> {
                Member member = memberMap.get(articleVO.getMemberId());
@@ -403,6 +410,13 @@
                    articleVO.setPhone(member.getPhone());
                }
            });
            voList.stream().filter(articleVO -> articleVO.getReported().equals(Boolean.TRUE))
                    .peek(articleVO -> {
                        Member member = memberMap.get(Long.valueOf(articleVO.getReportBy()));
                        if (StringUtils.isNotNull(member)) {
                            articleVO.setReportBy(member.getNickname());
                        }
                    }).collect(Collectors.toList());
        }
        return pageVO;
    }

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionGoodsDTO.java

@@ -47,7 +47,6 @@
    private Integer auctionStock;

    @ApiModelProperty(value = "保证金")
    @NotNull(message = "保证金不能为空")
    private BigDecimal bond;

    @ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java

@@ -47,7 +47,6 @@
    private AuthenticationEnum authentication;

    @ApiModelProperty(value = "拍卖场说明")
    @NotBlank(message = "拍卖场说明不能为空")
    private String description;

    @ApiModelProperty(value = "拍卖场封面图")

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java

@@ -274,13 +274,17 @@
                        .collect(Collectors.toSet());
                List<Member> memberList = memberClient.
                        getMemberListByIds(collect, SecurityConstants.INNER).getData();
                Map<Long, String> memberMap = memberList.stream()
                        .collect(Collectors.toMap(Member::getId, Member::getNickname));
                Map<Long, Member> memberMap = memberList.stream()
                        .collect(Collectors.toMap(Member::getId, e -> e));
                List<MgtAuctionBidRecordVO> mgtAuctionBidRecordVOS = BeanUtils.copyList(list,
                        MgtAuctionBidRecordVO.class);
                for (MgtAuctionBidRecordVO vo : mgtAuctionBidRecordVOS) {
                    String memberName = memberMap.get(vo.getMemberId());
                    vo.setMemberName(StringUtils.isNotEmpty(memberName) ? memberName : "");
                    Member member = memberMap.get(vo.getMemberId());
                    if (StringUtils.isNotNull(member)) {
                        vo.setMemberName(member.getNickname());
                        vo.setPhone(member.getPhone());
                    }

                }
                auctionGoodsVO.setRecordList(mgtAuctionBidRecordVOS);
            }

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.file.FileUtils;
import com.ruoyi.file.service.ISysFileService;
import com.ruoyi.file.utils.StateCloudObsUtil;
import com.ruoyi.system.api.domain.SysFile;
import io.swagger.annotations.ApiOperation;
import java.io.InputStream;
@@ -60,8 +61,8 @@
    public R<String> obsUpload(@RequestPart("file") MultipartFile file) {
        try {
            // 上传并返回访问地址

            return R.ok("1");
            String url = StateCloudObsUtil.uploadFile(file);
            return R.ok(url);
        } catch (Exception e) {
            log.error("上传文件失败", e);
            return R.fail(e.getMessage());
@@ -77,7 +78,8 @@
        List<String> urls = new ArrayList<>();
        try {
            for (MultipartFile multipartFile : file) {
                urls.add("1");
                String url = StateCloudObsUtil.uploadFile(multipartFile);
                urls.add(url);
            }
            // 上传并返回访问地址
            return R.ok(urls);
@@ -92,8 +94,8 @@
            @RequestParam("stream") InputStream stream) {
        try {
            // 上传并返回访问地址

            return R.ok("1");
            String url = StateCloudObsUtil.obsUploadStream(code, stream);
            return R.ok(url);
        } catch (Exception e) {
            log.error("上传文件失败", e);
            return R.fail(e.getMessage());

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/StateCloudObsUtil.java

@@ -1,18 +1,29 @@
/*

package com.ruoyi.file.utils;


import com.amazonaws.ClientConfiguration;
import com.amazonaws.Protocol;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import com.amazonaws.services.s3.model.PutObjectResult;
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;
import org.springframework.web.multipart.MultipartFile;

*/
/**
 * 天翼云OBS 工具类
 *
 * @author mitao
 * @date 2024/6/17
 *//*
 */

public class StateCloudObsUtil {

@@ -98,4 +109,4 @@
        return fileName;
    }
}
*/


 ruoyi-modules/ruoyi-file/target/classes/banner.txt

File was deleted

 ruoyi-modules/ruoyi-file/target/classes/bootstrap.yml

File was deleted

 ruoyi-modules/ruoyi-file/target/classes/logback.xml

File was deleted

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/forepart/GoodsGroupPurchaseInfoController.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.goods.controller.forepart;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 团购商品的成团 前端控制器
 * </p>
 *
 * @author mitao
 * @since 2024-07-15
 */
@RestController
@RequestMapping("/goods-group-purchase-info")
public class GoodsGroupPurchaseInfoController {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchaseInfo.java

New file
@@ -0,0 +1,62 @@
package com.ruoyi.goods.domain;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 团购商品的成团
 * </p>
 *
 * @author mitao
 * @since 2024-07-15
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_goods_group_purchase_info")
@ApiModel(value="GoodsGroupPurchaseInfo对象", description="团购商品的成团")
public class GoodsGroupPurchaseInfo implements Serializable {

    private static final long serialVersionUID = 1L;

    private Long id;

    @ApiModelProperty(value = "团购id")
    private Long groupPurchaseId;

    @ApiModelProperty(value = "当前人数")
    private Integer currentNumber;

    @ApiModelProperty(value = "团购唯一标识")
    private Long mubre;

    @ApiModelProperty(value = "成团人数")
    private Integer groupSize;

    @ApiModelProperty(value = "0 是未成团，1 是已经成团")
    private Integer groupStatus;

    @ApiModelProperty(value = "创建者")
    private String createBy;

    @ApiModelProperty(value = "创建时间")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "更新者")
    private String updateBy;

    @ApiModelProperty(value = "更新时间")
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
    private Integer delFlag;


}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsGroupPurchaseInfoMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.goods.mapper;

import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 团购商品的成团 Mapper 接口
 * </p>
 *
 * @author mitao
 * @since 2024-07-15
 */
public interface GoodsGroupPurchaseInfoMapper extends BaseMapper<GoodsGroupPurchaseInfo> {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsGroupPurchaseInfoService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.goods.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;

/**
 * <p>
 * 团购商品的成团 服务类
 * </p>
 *
 * @author mitao
 * @since 2024-07-15
 */
public interface IGoodsGroupPurchaseInfoService extends IService<GoodsGroupPurchaseInfo> {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseInfoServiceImpl.java

New file
@@ -0,0 +1,21 @@
package com.ruoyi.goods.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.goods.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.goods.mapper.GoodsGroupPurchaseInfoMapper;
import com.ruoyi.goods.service.IGoodsGroupPurchaseInfoService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 团购商品的成团 服务实现类
 * </p>
 *
 * @author mitao
 * @since 2024-07-15
 */
@Service
public class GoodsGroupPurchaseInfoServiceImpl extends ServiceImpl<GoodsGroupPurchaseInfoMapper, GoodsGroupPurchaseInfo> implements
        IGoodsGroupPurchaseInfoService {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.goods.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.redis.service.RedisService;
@@ -7,19 +8,16 @@
import com.ruoyi.goods.mapper.GoodsSeckillAppointmentMapper;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillAppointmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.system.api.constants.DelayTaskEnum;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * <p>

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsGroupPurchaseInfoMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.goods.mapper.GoodsGroupPurchaseInfoMapper">

</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -107,16 +107,18 @@

  </select>
  <select id="getStaticsOrderList" resultType="com.ruoyi.system.api.domain.Order">
    SELECT o.*
    FROM t_order o
    LEFT JOIN t_order_return_request torr ON o.id = torr.order_id
    SELECT
    *
    FROM
    t_order
    <where>
      <if test="startTime != null and endTime != null">
        o.create_time between #{startTime} and #{endTime}
        create_time between #{startTime} and #{endTime}
      </if>
      AND o.order_status IN (1, 2, 3, 4)
      OR (o.order_status = 6 AND torr.audit_status != 2)
      AND order_status IN ( 1, 2, 3, 4 ) AND
      (is_request = 1 OR (is_request = 2 AND id in (SELECT order_id FROM t_order_return_request
      WHERE
      audit_status != 2)))
    </where>
  </select>

</mapper>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java

@@ -100,7 +100,8 @@
        PageInfo<SysRole> page = roleService.page(pageInfo,
                new LambdaQueryWrapper<SysRole>().ne(SysRole::getRoleId, 20)
                        .like(StringUtils.isNotBlank(query.getRoleName()), SysRole::getRoleName,
                                query.getRoleName()).eq(SysRole::getDelFlag, "0"));
                                query.getRoleName()).eq(SysRole::getDelFlag, "0")
                        .orderByDesc(SysRole::getCreateTime));
        return AjaxResult.success(page);
    }


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -116,7 +116,7 @@
    public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
        SysUser user = BeanUtils.copyBean(dto, SysUser.class);
        user.setUserId(null);
        user.setUserType(dto.getIsAuctioneer() == 1 ? "04" : "00");
        user.setUserType(dto.getIsAuctioneer() == 1 ? "00" : "04");
        user.setUserName(user.getPhonenumber());
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -475,7 +475,7 @@
//            checkUserDataScope(userId);
        }
        // 删除用户与角色关联
//        userRoleMapper.deleteUserRole(userIds);
        userRoleMapper.deleteUserRole(userIds);
//        // 删除用户与岗位关联
//        userPostMapper.deleteUserPost(userIds);
        return userMapper.deleteUserByIds(userIds);