Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 d36bb8b4ea60d1bb0d46bbc0c5dbc02aca86afcd

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CustomConfig.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CustomConfig.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.system.api.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java

@@ -129,5 +129,20 @@
    @ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
    private Integer invoiceStatus;

    @ApiModelProperty(value = "优惠券id")
    private Long couponId;

    @ApiModelProperty(value = "商品id")
    private Long goodsSkuId;

    @ApiModelProperty(value = "商品名称")
    private String skuName;

    @ApiModelProperty(value = "封面图")
    private String coverPic;

    @ApiModelProperty(value = "商品价格")
    private BigDecimal price;


}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysConfig.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.system.api.domain;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.dto;
package com.ruoyi.system.api.domain.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionSalesroomGoodsInfoDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/AuctionSalesroomGoodsInfoDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.dto;
package com.ruoyi.system.api.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionBidRecordDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionBidRecordDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.dto;
package com.ruoyi.system.api.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/ForepartAuctionVideo.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/ForepartAuctionVideo.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.dto;
package com.ruoyi.system.api.domain.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberOrderListDTO.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.system.api.domain.dto;

import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class MemberOrderListDTO extends BasePage {
    @ApiModelProperty("订单id")
    private Long id;

    @ApiModelProperty(value = "订单编号")
    private String orderNo;

    @ApiModelProperty(value = "商品名称")
    private String goodsSkuName;

    @ApiModelProperty(value = "会员id")
    private Long memberId;

    @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
    private OrderStatusEnum orderStatus;
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java

@@ -15,6 +15,9 @@

    @ApiModelProperty(value = "商品id")
    private Long goodsSkuId;
    @ApiModelProperty(value = "拍卖场id")
    private Long auctionSalesroomId;


    @ApiModelProperty(value = "订单编号")
    private String orderNo;
@@ -55,4 +58,13 @@
    @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
    private AuctionOrderTypeEnum auctionType;

    @ApiModelProperty(value = "商品名称")
    private String skuName;

    @ApiModelProperty(value = "封面图")
    private String coverPic;

    @ApiModelProperty(value = "商品价格")
    private BigDecimal price;

}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderReturnDTO.java

New file
@@ -0,0 +1,35 @@
package com.ruoyi.system.api.domain.dto;

import com.ruoyi.common.core.enums.RequestTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDateTime;

@Data
public class OrderReturnDTO {
    @ApiModelProperty(value = "数据id")
    private Integer id;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "订单id")
    private Long orderId;

    @ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
    private RequestTypeEnum requestType;

    @ApiModelProperty(value = "申请原因")
    private String requestReason;

    @ApiModelProperty(value = "详情图，不超过五张图片")
    private MultipartFile[] album;

    @ApiModelProperty(value = "快递单号")
    private String courierNumber;



}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/SaveSignUpNowDTO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/SaveSignUpNowDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.dto;
package com.ruoyi.system.api.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionBidRecordVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomGoodsInfoVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/AuctionSalesroomVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/ForepartAuctionSalesroomVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomInfoVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java

File was renamed from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/vo/MemberAuctionSalesroomVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.auction.controller.forepart.vo;
package com.ruoyi.system.api.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java

New file
@@ -0,0 +1,41 @@
package com.ruoyi.system.api.domain.vo;

import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
@Data
public class MemberOrderListVO {
    @ApiModelProperty(value = "订单id")
    private Long id;

    @ApiModelProperty(value = "订单编号")
    private String orderNo;

    @ApiModelProperty(value = "商品id")
    private Long goodsSkuId;
    @ApiModelProperty(value = "会员id")
    private Long memberId;

    @ApiModelProperty(value = "支付合计")
    private BigDecimal totalAmount;


    @ApiModelProperty(value = "商品名称")
    private String skuName;

    @ApiModelProperty(value = "封面图")
    private String coverPic;

    @ApiModelProperty(value = "商品数量")
    private Integer goodsQuantity;

    @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消, 6售后订单")
    private OrderStatusEnum orderStatus;


    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
    private OrderFromEnum orderFrom;
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java

@@ -56,7 +56,6 @@
    private String orderRemark;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime deliveryTime;

    @ApiModelProperty(value = "确认收货时间")
@@ -102,4 +101,13 @@
    @ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
    private Integer invoiceStatus;

    @ApiModelProperty(value = "商品名称")
    private String skuName;

    @ApiModelProperty(value = "封面图")
    private String coverPic;

    @ApiModelProperty(value = "商品价格")
    private BigDecimal price;

}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java

@@ -30,6 +30,11 @@
            public R<CouponMember> getCouponMember(CouponMemberDTO couponMemberDTO, String source) {
                return R.fail("获取会员优惠券信息失败:" + cause.getMessage());
            }

            @Override
            public R<?> updCouponMember(CouponMemberDTO couponMemberDTO, String source) {
                return R.fail("修改会员优惠券信息失败:" + cause.getMessage());
            }
        };



 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
@@ -77,6 +78,11 @@
            public R<?> deleteDelayTask(String key, String source) {
                return R.fail("删除延时任务失败:" + cause.getMessage());
            }

            @Override
            public R<CustomConfig> getconfig(String configId) {
                return R.fail("获取系统配置失败:" + cause.getMessage());
            }
        };
    }
}

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

@@ -30,4 +30,8 @@
    R<CouponMember> getCouponMember(@RequestBody CouponMemberDTO couponMemberDTO,
                                    @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @PostMapping("/coupon-member/updCouponMember")
    R<?> updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO,
                                    @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

}

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

@@ -3,9 +3,7 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
@@ -88,4 +86,7 @@
    @PostMapping("/delay-task/deleteDelayTask")
    public R<?> deleteDelayTask(@RequestBody String key,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @GetMapping("/custom-config/{configId}")
    R<CustomConfig>  getconfig(@PathVariable("configId") String configId);
}

 ruoyi-api/ruoyi-api-system/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -2,3 +2,9 @@
com.ruoyi.system.api.factory.RemoteLogFallbackFactory
com.ruoyi.system.api.factory.RemoteFileFallbackFactory
com.ruoyi.system.api.factory.SysUserFallbackFactory
com.ruoyi.system.api.factory.GoodsSkuFactory
com.ruoyi.system.api.factory.ArticleFallbackFactory
com.ruoyi.system.api.factory.AuctionFallbackFactory
com.ruoyi.system.api.factory.MemberFallbackFactory
com.ruoyi.system.api.factory.OrderFallbackFactory
com.ruoyi.system.api.factory.PromotionFallbackFactory

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java

@@ -15,7 +15,8 @@
    TO_BE_SHIPPED(2, "待发货"),
    GOODS_TO_BE_RECEIVED(3, "待收货"),
    FINISHED(4, "已完成"),
    CANCELED(5, "已取消");
    CANCELED(5, "已取消"),
    AFTER_SALE(6, "售后");

    @EnumValue
    private final int code;

 ruoyi-common/ruoyi-common-core/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
com.ruoyi.common.core.utils.SpringUtils
com.ruoyi.common.core.utils.SpringUtils
com.ruoyi.common.core.config.MybatisPlusConfig

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java

@@ -1,9 +1,9 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.vo.AuctionBidRecordVO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java

@@ -1,15 +1,14 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java

@@ -1,17 +1,19 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.vo.*;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;

import org.springframework.web.bind.annotation.*;

/**

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionVideoController.java

@@ -1,13 +1,12 @@
package com.ruoyi.auction.controller.forepart;


import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.system.api.domain.dto.ForepartAuctionVideo;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.PromotionVideo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/dto/OrderDTO.java

File was deleted

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionSalesroomController.java

@@ -1,25 +1,10 @@
package com.ruoyi.auction.controller.inner;


import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java

@@ -1,7 +1,7 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import java.util.List;


 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java

@@ -1,10 +1,13 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.vo.*;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java

@@ -1,11 +1,11 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSaleroomBidRecordQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsQuery;

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionVideoService.java

@@ -1,7 +1,7 @@
package com.ruoyi.auction.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.system.api.domain.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.AuctionVideo;
import com.ruoyi.system.api.domain.PromotionVideo;
import java.util.List;

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

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.mapper.AuctionBidRecordMapper;

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

@@ -4,13 +4,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.dto.OrderDTO;
import com.ruoyi.auction.controller.forepart.vo.AuctionBidRecordVO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomGoodsInfoVO;
import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.AuctionBrowseRecord;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
@@ -37,6 +36,7 @@
import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
@@ -553,8 +553,10 @@
        order.setOrderFrom(OrderFromEnum.AUCTION_ORDERS);
        order.setMemberId(memberId);
        AuctionSalesroomGoods auctionSalesroomGoods = this.getById(goodsSkuId);

        order.setGoodsQuantity(1);
        order.setTotalAmount(lastBidAmount);
        order.setAuctionSalesroomId(auctionSalesroomGoods.getAuctionSalesroomId());

        R<MemberAddress> memberAddressR = emberClient.getMemberAddressOne(memberId,
                SecurityConstants.INNER);
@@ -565,7 +567,12 @@
        order.setReceiverName(memberAddress.getRecipientName());
        order.setBound(bound);
        order.setAuctionType(AuctionOrderTypeEnum.AUCTION_ITEMS);

        GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER)
                .getData();
        order.setSkuName(goodsSku.getSkuName());
        order.setCoverPic(goodsSku.getCoverPic());
        order.setPrice(lastBidAmount);
        orderClient.saveOrderOne(order,SecurityConstants.INNER);
    }



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

@@ -2,7 +2,6 @@

import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
@@ -16,12 +15,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.system.api.domain.vo.MemberAuctionSalesroomVO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSaleroomBidRecordQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsDTO;

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

@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionVideo;
import com.ruoyi.system.api.domain.dto.ForepartAuctionVideo;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.domain.AuctionVideo;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.mapper.AuctionSalesroomMapper;
import com.ruoyi.auction.mapper.AuctionVideoMapper;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.auction.service.IAuctionVideoService;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsSkuDTO.java

@@ -11,6 +11,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.Data;
import  com.ruoyi.goods.controller.management.dto.GoodsInfoTitleValueDTO;

/**
 * @author mitao

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java

@@ -37,9 +37,6 @@
    @Resource
    private IMemberService iMemberService;




     @PostMapping("/miniLogin")
    @ApiOperation(value = "用户端-第三方登陸")
    public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartMemberInvoiceController.java

@@ -32,7 +32,7 @@
    private IMemberInvoiceService iMemberInvoiceService;

    @PostMapping("/saveMemberInvoice")
    @ApiOperation(value = "用户端-用户添加发票")
    @ApiOperation(value = "用户端-用户去发票")
    public R saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
        iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
        return R.ok();

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java

@@ -2,9 +2,13 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -39,4 +43,31 @@
        return R.ok(orderService.updMemberOrder(memberOrderDTO));
    }


    @PostMapping("/MemberOrderList")
    @ApiOperation(value = "用户端-订单列表")
    public R<PageDTO<MemberOrderListVO>> MemberrderList(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        return R.ok(orderService.MemberrderList(memberOrderListDTO));
    }

    @PostMapping("/MemberOrderOne")
    @ApiOperation(value = "用户端-订单详情")
    public R<OrderVO> MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        return R.ok(orderService.MemberOrderOne(memberOrderListDTO));
    }

    @PostMapping("/CancelOrderOne")
    @ApiOperation(value = "用户端-取消订单")
    public R CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        orderService.MemberOrderOne(memberOrderListDTO);
        return R.ok();
    }

    @PostMapping("/AffirmOrderOne")
    @ApiOperation(value = "用户端-确认收货订单")
    public R AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
        orderService.AffirmOrderOne(memberOrderListDTO);
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderReturnRequestController.java

New file
@@ -0,0 +1,44 @@
package com.ruoyi.order.controller.forepart;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.ruoyi.order.service.IOrderReturnRequestService;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * <p>
 * 售后表 前端控制器
 * </p>
 *
 * @author mitao
 * @since 2024-05-16
 */
@RestController
@RequestMapping("/forepart/order-return-request")
public class ForepartOrderReturnRequestController {
    @Resource
    private IOrderReturnRequestService OrderReturnRequestService;

    @PostMapping("/saveOrderReturnRequest")
    @ApiOperation(value = "用户端-申请订单售后")
    public R saveOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
        OrderReturnRequestService.saveOrderReturnRequest(OrderReturnDTO);
        return R.ok();
    }

    @PostMapping("/updOrderReturnRequest")
    @ApiOperation(value = "修改用户端-修改订单售后")
    public R updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO) {
        OrderReturnRequestService.updOrderReturnRequest(OrderReturnDTO);
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderMall.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderReturnRequest.java

@@ -79,5 +79,23 @@
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "详情图，不超过五张图片")
    private String album;

    @ApiModelProperty(value = "收件人姓名")
    private String recipientName;

    @ApiModelProperty(value = "收件人电话")
    private String recipientPhone;

    @ApiModelProperty(value = "详细地址")
    private String detailedAddress;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "快递单号")
    private String courierNumber;


}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMallMapper.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderMallService.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderReturnRequestService.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * <p>
@@ -13,4 +15,8 @@
 */
public interface IOrderReturnRequestService extends IService<OrderReturnRequest> {

   void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO);
   void updOrderReturnRequest(@RequestBody OrderReturnDTO OrderReturnDTO);


}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java

@@ -1,10 +1,13 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -54,5 +57,11 @@

    MemberTiOrderVO updMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);

    PageDTO<MemberOrderListVO> MemberrderList(@RequestBody MemberOrderListDTO memberOrderListDTO);

    OrderVO MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
    void CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);

    void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java

@@ -11,13 +11,11 @@
import com.ruoyi.order.domain.MemberInvoice;
import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.domain.OrderAuction;
import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
import com.ruoyi.order.service.IOrderAuctionService;
import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
@@ -42,8 +40,7 @@
    @Resource
    private IMemberInvoiceOrderService iMemberInvoiceOrderService;

    @Resource
    private IOrderMallService iOrderMallService;


    @Resource
    private IOrderService iOrderService;
@@ -75,32 +72,13 @@
       for (Integer memberInvoiceOrder:memberInvoiceOrderList){
           MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder();
           Order order= iOrderService.getById(memberInvoiceOrder);
           order.setInvoiceStatus(1);
           iOrderService.updateById(order);
           memberInvoiceOrder1.setInvoiceId(memberInvoice.getId());
           memberInvoiceOrder1.setOrderMoney(order.getTotalAmount());
           memberInvoiceOrder1.setOrderNo(order.getOrderNo());
           String OrderName="";
           if (order.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER)||order.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS)||order.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS)){
               LambdaQueryWrapper<OrderMall> wrapper = Wrappers.lambdaQuery();
               wrapper.eq(OrderMall::getOrderId, order.getId());
               wrapper.eq(OrderMall::getDelFlag, 0);
               OrderMall orderMall= iOrderMallService.getOne(wrapper);
               R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(orderMall.getGoodsSkuId(),
                       SecurityConstants.INNER);
               GoodsSku goodsSku=goodsSkuR.getData();
               OrderName=goodsSku.getSkuName();
           }else{
               LambdaQueryWrapper<OrderAuction> wrapper = Wrappers.lambdaQuery();
               wrapper.eq(OrderAuction::getOrderId, order.getId());
               wrapper.eq(OrderAuction::getDelFlag, 0);
               OrderAuction orderAuction=iOrderAuctionService.getOne(wrapper);
               R<GoodsSeckill> goodsSeckillR = goodsSkuClient.getGoodsSeckillOne(
                       orderAuction.getSalesroomGoodsId(), SecurityConstants.INNER);
               GoodsSeckill goodsSeckill=goodsSeckillR.getData();
               R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(goodsSeckill.getGoodsSkuId(),
                       SecurityConstants.INNER);
               GoodsSku goodsSku=goodsSkuR.getData();
               OrderName=goodsSku.getSkuName();
           }
           OrderName=order.getSkuName();
           memberInvoiceOrder1.setOrderName(OrderName);
           iMemberInvoiceOrderService.save(memberInvoiceOrder1);
       }

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderMallServiceImpl.java

File was deleted

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java

@@ -1,10 +1,23 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.mapper.OrderReturnRequestMapper;
import com.ruoyi.order.service.IOrderReturnRequestService;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.dto.OrderReturnDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**
 * <p>
@@ -16,5 +29,45 @@
 */
@Service
public class OrderReturnRequestServiceImpl extends ServiceImpl<OrderReturnRequestMapper, OrderReturnRequest> implements IOrderReturnRequestService {
    @Resource
    private SysUserClient sysUserClient;
    @Override
    public void saveOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
        OrderReturnRequest orderReturnRequest = new OrderReturnRequest();
        orderReturnRequest.setOrderId(OrderReturnDTO.getOrderId());
        orderReturnRequest.setRequestTime(LocalDateTime.now());
        orderReturnRequest.setRequestType(OrderReturnDTO.getRequestType());
        orderReturnRequest.setRequestReason(OrderReturnDTO.getRequestReason());
        orderReturnRequest.setStatus(ReturnRequestStatusEnum.TO_BE_REVIEWED);
        orderReturnRequest.setAuditStatus(AuditStatusEnum.TO_BE_REVIEWED);

        List<String> urlList = new ArrayList<>();
        if (OrderReturnDTO.getAlbum().length > 0) {
            for (MultipartFile file : OrderReturnDTO.getAlbum()) {
                try {
                    String url = HuaWeiOBSUtil.obsUpload(file);
                    urlList.add(url);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
            }
            orderReturnRequest.setAlbum(urlList.toString());
        }

        CustomConfig returnAddressUserName = sysUserClient.getconfig("RETURN_ADDRESS_USER_NAME").getData();
        orderReturnRequest.setRecipientName(returnAddressUserName.getConfigName());
        CustomConfig returnAddressUserPhone = sysUserClient.getconfig("RETURN_ADDRESS_USER_PHONE").getData();
        orderReturnRequest.setRecipientPhone(returnAddressUserPhone.getConfigName());
        CustomConfig returnAddressUserAddress = sysUserClient.getconfig("RETURN_ADDRESS_USER_ADDRESS").getData();
        orderReturnRequest.setDetailedAddress(returnAddressUserAddress.getConfigName());
        this.save(orderReturnRequest);

    }

    @Override
    public void updOrderReturnRequest(OrderReturnDTO OrderReturnDTO) {
        OrderReturnRequest byId = this.getById(OrderReturnDTO.getId());
        byId.setCourierNumber(OrderReturnDTO.getCourierNumber());
        this.updateById(byId);
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -1,5 +1,8 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.SecurityConstants;
@@ -8,26 +11,35 @@
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.domain.dto.*;

import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Resource;

import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.PromotionClient;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Service;

/**
@@ -41,11 +53,6 @@
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {



    @Resource
    private IOrderMallService orderMallService;

    @Resource
    private GoodsSkuClient goodsSkuClient;

@@ -54,6 +61,15 @@

    @Resource
    private PromotionClient promotionClient;

    @Resource
    private OrderAuctionBondMapper orderAuctionBondMapper;

    @Resource
    private IPaylogService iPaylogService;

    @Resource
    private PaylogServiceImpl paylogService;


    @Override
@@ -77,6 +93,7 @@
        order.setOrderTime(OrderDTO.getOrderTime());
        order.setOrderFrom(OrderDTO.getOrderFrom());
        order.setAuctionType(OrderDTO.getAuctionType());
        order.setGoodsSkuId(OrderDTO.getGoodsSkuId());
        order.setMemberId(OrderDTO.getMemberId());
        order.setTotalAmount(OrderDTO.getTotalAmount());
        order.setOrderStatus(OrderStatusEnum.TO_PLAY);
@@ -86,7 +103,37 @@
        order.setReceiverCity(OrderDTO.getReceiverCity());
        order.setReceiverDetailAddress(OrderDTO.getReceiverDetailAddress());
        order.setBound(OrderDTO.getBound());
        order.setSkuName(OrderDTO.getSkuName());
        order.setPrice(OrderDTO.getPrice());
        order.setCoverPic(OrderDTO.getCoverPic());
        this.save(order);

        if (OrderDTO.getOrderFrom().getCode()==4){
            if (OrderDTO.getAuctionType().getCode()==1){
                LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
                wrapper.eq(OrderAuctionBond::getMemberId,OrderDTO.getMemberId());
                wrapper.eq(OrderAuctionBond::getAuctionGoodsId,OrderDTO.getGoodsSkuId());
                wrapper.eq(OrderAuctionBond::getBoundStatus,2);
                wrapper.eq(OrderAuctionBond::getBondType,1);
                OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
                orderAuctionBond.setOrderId(order.getId());
                orderAuctionBondMapper.updateById(orderAuctionBond);
            }
            if (OrderDTO.getAuctionType().getCode()==2){
                LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
                wrapper.eq(OrderAuctionBond::getMemberId,OrderDTO.getMemberId());
                wrapper.eq(OrderAuctionBond::getAuctionGoodsId,OrderDTO.getGoodsSkuId());
                wrapper.eq(OrderAuctionBond::getBoundStatus,2);
                wrapper.eq(OrderAuctionBond::getAuctionSalesroomId,OrderDTO.getAuctionSalesroomId());
                wrapper.eq(OrderAuctionBond::getBondType,2);
                OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);
                orderAuctionBond.setOrderId(order.getId());
                orderAuctionBondMapper.updateById(orderAuctionBond);
            }

        }


    }

    /**
@@ -108,11 +155,7 @@
     */
    @Override
    public Integer getGroupPurchasesGoodsNum(Long id) {
        Set<Long> orderIdSet = orderMallService.lambdaQuery().eq(OrderMall::getActivityId, id)
                .list()
                .stream().map(OrderMall::getOrderId).collect(
                        Collectors.toSet());
        List<Order> list = this.lambdaQuery().in(Order::getId, orderIdSet)
        List<Order> list = this.lambdaQuery().eq(Order::getId, id)
                .in(Order::getOrderStatus, OrderStatusEnum.TO_BE_SHIPPED,
                        OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
        return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
@@ -174,6 +217,10 @@
                goodsStockUpdDTO.setAuctionStock(memberOrderDTO.getGoodsQuantity()*-1);
                goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
                        SecurityConstants.INNER);

                order.setSkuName(goodsSku.getSkuName());
                order.setPrice(goodsSku.getPrice());
                order.setCoverPic(goodsSku.getCoverPic());
            }
            memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
            memberOrderVO.setPrice(goodsSku.getPrice());
@@ -199,8 +246,11 @@
                goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
                goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()-memberOrderDTO.getGoodsQuantity());
                goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);
            }

            }
            order.setSkuName(goodsSku.getSkuName());
            order.setPrice(data.getSeckillPrice());
            order.setCoverPic(goodsSku.getCoverPic());

        }
        if (memberOrderDTO.getOrderFrom()==3){
@@ -213,6 +263,10 @@
            memberOrderVO.setSkuName(goodsSku.getSkuName());
            memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
            pice=data.getGroupPurchasePrice();

            order.setSkuName(goodsSku.getSkuName());
            order.setPrice(data.getGroupPurchasePrice());
            order.setCoverPic(goodsSku.getCoverPic());
        }
        order.setMemberId(memberOrderDTO.getMemberId());
        order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
@@ -237,20 +291,9 @@
            }
        }


        order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
        baseMapper.insert(order);
        OrderMall orderMall=new OrderMall();
        orderMall.setOrderId(order.getId());
        if (memberOrderDTO.getOrderFrom()==1){
            orderMall.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
        }
        if (memberOrderDTO.getOrderFrom()==2){
            orderMall.setActivityId(memberOrderDTO.getGoodsSkuId());
        }
        if (memberOrderDTO.getOrderFrom()==3){
            orderMall.setActivityId(memberOrderDTO.getGoodsSkuId());
        }
        orderMallService.save(orderMall);

        memberOrderVO.setId(order.getId());
        memberOrderVO.setOrderStatus(OrderStatusEnum.TO_PLAY);
        memberOrderVO.setOrderNo(order.getOrderNo());
@@ -347,17 +390,27 @@
            CouponMemberDTO couponMemberDTO=new CouponMemberDTO();
            couponMemberDTO.setId(memberOrderDTO.getCouponId());
            CouponMember data = promotionClient.getCouponMember(couponMemberDTO, SecurityConstants.INNER).getData();


            if (order.getCouponId()!=null){
                CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
                couponMemberDTO1.setId(memberOrderDTO.getCouponId());
                couponMemberDTO1.setCouponStatus(1);
                promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
            }

            BigDecimal pice=new BigDecimal(0);
            if (data.getCouponType().getCode()==1){
                pice= order.getTotalAmount();
                if (pice.doubleValue()>=data.getFullReductionAmount().doubleValue()){
                    pice.subtract(data.getReductionAmount());
                    order.setDiscountMoney(data.getReductionAmount());
                }
            }
            if (data.getCouponType().getCode()==2){
                pice= order.getTotalAmount();
                pice.subtract(data.getVoucherAmount());

                order.setDiscountMoney(data.getVoucherAmount());
            }
            if (data.getCouponType().getCode()==3){
                pice= order.getTotalAmount();
@@ -367,11 +420,19 @@
                BigDecimal pice4= pice.subtract(pice3);
               if (pice4.doubleValue()>data.getMaxDiscount().doubleValue()){
                   pice=pice.subtract(data.getMaxDiscount());
                   order.setDiscountMoney(data.getMaxDiscount());
               }else{
                   order.setDiscountMoney(pice4);
                   pice=pice3;
               }

            }
            order.setCouponId(memberOrderDTO.getCouponId());
            CouponMemberDTO couponMemberDTO2=new CouponMemberDTO();
            couponMemberDTO2.setId(memberOrderDTO.getCouponId());
            couponMemberDTO2.setCouponStatus(2);
            promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);

            order.setTotalAmount(pice);
        }

@@ -396,4 +457,125 @@

        return memberOrderVO;
    }

    @Override
    public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) {
        Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize());
        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
        wrapper.like(Order::getSkuName,memberOrderListDTO.getGoodsSkuName());
        wrapper.like(Order::getOrderNo,memberOrderListDTO.getOrderNo());
        wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus());
        wrapper.eq(Order::getDelFlag,0);
        wrapper.orderByDesc(Order::getCancelTime);
        Page<Order> page1 = this.page(page, wrapper);

        PageDTO<MemberOrderListVO> memberOrderListVOPageDTO = PageDTO.of(page1, MemberOrderListVO.class);
        return memberOrderListVOPageDTO;
    }

    @Override
    public OrderVO MemberOrderOne(MemberOrderListDTO memberOrderListDTO) {
        Order order = baseMapper.selectById(memberOrderListDTO.getId());
        OrderVO orderVO=new OrderVO();
        try {
            BeanUtils.copyProperties(orderVO,order);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        return orderVO;
    }

    @Override
    public void CancelOrderOne(MemberOrderListDTO memberOrderListDTO) {
        Order order = baseMapper.selectById(memberOrderListDTO.getId());
        if (order.getOrderStatus().getCode()==1){
            order.setOrderStatus(OrderStatusEnum.CANCELED);
            order.setCancelTime(LocalDateTime.now());
            baseMapper.updateById(order);
        }
        if (order.getOrderStatus().getCode()==2) {
            order.setOrderStatus(OrderStatusEnum.CANCELED);
            order.setCancelTime(LocalDateTime.now());
            baseMapper.updateById(order);
            if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
                //获取支付信息
                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
                Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
                boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
                if (!bo) {
                    System.out.println("支付宝退款失败");
                }
            } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
                //获取支付信息
                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
                Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);

                String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
                String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
                refundFee = 1;

                String regEx = "[^0-9]";
                Pattern p = Pattern.compile(regEx);
                Matcher m = p.matcher(order.getOrderNo());
                String ma = m.replaceAll("").trim();
                boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
                if (!bo) {
                    System.out.println("微信退款失败");
                }
            }
        }}

    @Override
    public void AffirmOrderOne(MemberOrderListDTO memberOrderListDTO) {
        Order order = baseMapper.selectById(memberOrderListDTO.getId());
        if (order.getOrderFrom().getCode()==4){
            order.setOrderStatus(OrderStatusEnum.FINISHED);
            order.setReceiveTime(LocalDateTime.now());
            baseMapper.updateById(order);

            LambdaQueryWrapper<OrderAuctionBond> wrapper= Wrappers.lambdaQuery();
            wrapper.eq(OrderAuctionBond::getOrderId,order.getId());
            OrderAuctionBond orderAuctionBond = orderAuctionBondMapper.selectOne(wrapper);

            if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 1) {//支付宝
                //获取支付信息
                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
                Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
                boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
                if (!bo) {
                    System.out.println("支付宝退款失败");
                }
            } else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
                //获取支付信息
                LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
                paylogEntityWrapper.eq(Paylog::getOutTradeNo, orderAuctionBond.getOrderNo());
                Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);

                String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
                String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
                Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
                refundFee = 1;

                String regEx = "[^0-9]";
                Pattern p = Pattern.compile(regEx);
                Matcher m = p.matcher(order.getOrderNo());
                String ma = m.replaceAll("").trim();
                boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
                if (!bo) {
                    System.out.println("微信退款失败");
                }
            }
        }else{
            order.setOrderStatus(OrderStatusEnum.FINISHED);
            order.setReceiveTime(LocalDateTime.now());
            baseMapper.updateById(order);
        }
    }
}

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

File was deleted

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

@@ -3,11 +3,9 @@
<mapper namespace="com.ruoyi.order.mapper.OrderMapper">

  <select id="getSeckillMembers" resultType="java.lang.Integer">
    SELECT ifnull(count(1), 0) form t_order_mall LEFT om
    JOIN t_order o
    ON om.order_id = o.id
    SELECT ifnull(count(1), 0) FROM t_order o
    WHERE
      om.goods_sku_id = #{id}
      o.goods_sku_id = #{id}
      AND o.order_status IN (2
        , 3
        , 4)
@@ -18,11 +16,9 @@


  <select id="getSeckillMembers1" resultType="com.ruoyi.system.api.domain.dto.MemberOrderDTO">
    SELECT ifnull(SUM(o.goods_quantity), 0) FROM t_order_mall om LEFT
    JOIN t_order o
    ON om.order_id = o.id
    SELECT ifnull(SUM(o.goods_quantity), 0) FROM t_order o LEFT
    WHERE
      om.goods_sku_id = #{goodsSkuId}
      o.goods_sku_id = #{goodsSkuId}
      AND o.order_status IN (2
        , 3)
     and o.member_id =#{memberId}
@@ -33,12 +29,11 @@
    SELECT
    o.*
    FROM
    t_order_mall tom
    LEFT JOIN t_order o ON tom.order_id = o.id
    t_order o
    <where>
      o.order_status = 2
      AND o.order_from = 3
      AND tom.activity_id = #{id}
      AND  o.goods_sku_id = #{id}
    </where>
  </select>

@@ -47,10 +42,9 @@
    SELECT
    o.*
    FROM
    t_order_mall tom
    LEFT JOIN t_order o ON tom.order_id = o.id
    t_order o
    <where>
      tom.activity_id = #{goodsSkuId}
      o.goods_sku_id = #{goodsSkuId}
      AND o.order_status = 2
      AND o.order_from = 3
      AND   o.member_id=#{memberId}
@@ -61,11 +55,10 @@
  <select id="getOrderByGroupPurchaseList" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
    SELECT
    o.*,
    tom.activityId as goodsSkuId
    o.goods_sku_id as goodsSkuId
    FROM
    t_order_mall tom
    LEFT JOIN t_order o ON tom.order_id = o.id
    LEFT JOIN t_goods_sku tgs ON tom.activityId = tg.id
    t_order o
    LEFT JOIN t_goods_sku tgs ON o.goods_sku_id = tgs.id
    <where>
       o.order_status = 2
      <if test="skuName != null and skuName != ''">

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/inner/CouponMemberController.java

@@ -34,4 +34,10 @@
        return R.ok(iCouponMemberService.getCouponMember(couponMemberDTO));
    }

    @PostMapping("/updCouponMember")
    public R updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO) {
        iCouponMemberService.updCouponMember(couponMemberDTO);
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java

@@ -20,4 +20,7 @@

    CouponMember getCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);


    void updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java

@@ -49,4 +49,11 @@
    public CouponMember getCouponMember(CouponMemberDTO couponMemberDTO) {
        return this.getById(couponMemberDTO.getId());
    }

    @Override
    public void updCouponMember(CouponMemberDTO couponMemberDTO) {
        CouponMember byId = this.getById(couponMemberDTO.getId());
        byId.setCouponStatus(couponMemberDTO.getCouponStatus());
        this.updateById(byId);
    }
}

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

@@ -1,9 +1,18 @@
package com.ruoyi.system.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.service.ICustomConfigService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

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

import javax.annotation.Resource;

/**
 * <p>
@@ -16,5 +25,14 @@
@RestController
@RequestMapping("/custom-config")
public class CustomConfigController {

    @Resource
    private ICustomConfigService iCustomConfigService;
    @GetMapping(value = "/{configId}")
    public R<CustomConfig> getconfig(@PathVariable String configId)
    {
        LambdaQueryWrapper<CustomConfig> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(CustomConfig::getConfigKey, configId);
        CustomConfig one = iCustomConfigService.getOne(wrapper);
        return R.ok(one);
    }
}

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

@@ -3,7 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -67,6 +68,9 @@
        return success(configService.selectConfigById(configId));
    }




    /**
     * 根据参数键名查询参数值
     */

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CustomConfigMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.CustomConfig;
import com.ruoyi.system.api.domain.CustomConfig;

/**
 * <p>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;

import java.util.List;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.api.domain.SysConfig;
import org.apache.ibatis.annotations.Mapper;

/**

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICustomConfigService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.CustomConfig;
import com.ruoyi.system.api.domain.CustomConfig;

/**
 * <p>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import java.util.List;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.api.domain.SysConfig;

/**
 * 参数配置 服务层

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

@@ -1,7 +1,7 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.CustomConfig;
import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.mapper.CustomConfigMapper;
import com.ruoyi.system.service.ICustomConfigService;
import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@
import java.util.List;
import javax.annotation.PostConstruct;

import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.api.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
    
    <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
    <resultMap type="com.ruoyi.system.api.domain.SysConfig" id="SysConfigResult">
        <id     property="configId"      column="config_id"      />
        <result property="configName"    column="config_name"    />
        <result property="configKey"     column="config_key"     />
@@ -33,12 +33,12 @@
        </where>
    </sql>
    
    <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
    <select id="selectConfig" parameterType="com.ruoyi.system.api.domain.SysConfig" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        <include refid="sqlwhereSearch"/>
    </select>
    
    <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
    <select id="selectConfigList" parameterType="com.ruoyi.system.api.domain.SysConfig" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        <where>
            <if test="configName != null and configName != ''">
@@ -69,7 +69,7 @@
        where config_key = #{configKey} limit 1
    </select>
    
    <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
    <insert id="insertConfig" parameterType="com.ruoyi.system.api.domain.SysConfig">
        insert into sys_config (
            <if test="configName != null and configName != '' ">config_name,</if>
            <if test="configKey != null and configKey != '' ">config_key,</if>
@@ -89,7 +89,7 @@
        )
    </insert>
     
    <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
    <update id="updateConfig" parameterType="com.ruoyi.system.api.domain.SysConfig">
        update sys_config 
        <set>
            <if test="configName != null and configName != ''">config_name = #{configName},</if>