1.补充文档

phpcjl

2024-12-04 639338faeadb596be5463887192471da68134c35

1.补充文档

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/factory/RemoteOrderFallbackFactory.java

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/factory/RemoteOrderGoodsFallbackFactory.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java
@@ -1,9 +1,10 @@
package factory;
package com.ruoyi.factory;

import com.ruoyi.common.core.domain.R;
import feignClient.RemoteOrderGoodsClient;
import com.ruoyi.feignClient.RemoteOrderGoodsClient;
import lombok.extern.slf4j.Slf4j;
import model.Order;
import com.ruoyi.model.Order;
import com.ruoyi.model.OrderGood;
import org.springframework.cloud.openfeign.FallbackFactory;

import java.util.List;
@@ -14,7 +15,7 @@
    public RemoteOrderGoodsClient create(Throwable cause) {
        return new RemoteOrderGoodsClient(){
            @Override
            public R<List<Order>> goodsOrder(List<Long> goodsIds) {
            public R<List<OrderGood>> goodsOrder(List<Long> goodsIds) {
                log.error("获取订单商品失败：{}", cause.getMessage());
                throw new RuntimeException("获取订单商品失败");
            }

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/feignClient/RemoteOrderClient.java

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/feignClient/RemoteOrderGoodsClient.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderGoodsClient.java
@@ -1,11 +1,11 @@
package feignClient;
package com.ruoyi.feignClient;


import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import factory.RemoteOrderGoodsFallbackFactory;
import model.Order;
import model.OrderGood;
import com.ruoyi.factory.RemoteOrderGoodsFallbackFactory;
import com.ruoyi.model.Order;
import com.ruoyi.model.OrderGood;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +19,7 @@
     * 查询指定商品订单
     */
    @PostMapping("/order-good/selectGoodsOrder")
    public R<List<Order>> goodsOrder(@RequestBody List<Long> goodsIds);
    public R<List<OrderGood>> goodsOrder(@RequestBody List<Long> goodsIds);

    /**
     * 根据ids查找订单列表

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/model/Order.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
@@ -1,4 +1,4 @@
package model;
package com.ruoyi.model;

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

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/model/OrderGood.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
@@ -1,4 +1,4 @@
package model;
package com.ruoyi.model;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/model/RefundPass.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/model/RefundPass.java
@@ -1,4 +1,4 @@
package model;
package com.ruoyi.model;

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

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/model/ShoppingCart.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/model/ShoppingCart.java
@@ -1,4 +1,4 @@
package model;
package com.ruoyi.model;

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

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/vo/OrderDetailVO.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/vo/OrderDetailVO.java
@@ -1,4 +1,4 @@
package vo;
package com.ruoyi.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/vo/OrderGoodsVO.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/vo/OrderGoodsVO.java
@@ -1,4 +1,4 @@
package vo;
package com.ruoyi.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java

@@ -1,6 +1,5 @@
package com.ruoyi.account.controller;

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
@@ -12,15 +11,12 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.feignClient.OrderClient;
import com.ruoyi.system.api.model.LoginUser;
import feignClient.RemoteOrderClient;
import feignClient.RemoteOrderGoodsClient;
import com.ruoyi.feignClient.RemoteOrderGoodsClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import model.Order;
import model.OrderGood;
import com.ruoyi.model.Order;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,11 +24,8 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Api(tags = "小程序-个人中心-我的钱包")
@@ -70,19 +63,27 @@
                                               @RequestParam(required = false) Integer changeType,
                                               @ApiParam(value = "创建时间")
                                               @RequestParam(required = false)
                                               @DateTimeFormat(pattern = "yyyy-MM")
                                               @DateTimeFormat(pattern = "yyyy-MM-dd")
                                               LocalDate createTime) {
        Long userId = SecurityUtils.getUserId();

        LocalDateTime localDateTime = null;
        LocalDateTime startTime = null;
        LocalDateTime endTime = null;
        if (createTime != null) {
            LocalTime specificTime = LocalTime.of(0, 0);
            localDateTime = createTime.atTime(specificTime);
            // 将 createTime 设置为当天的开始时间 (00:00)
            startTime = createTime.atStartOfDay();

            // 使用 YearMonth 来获取该月的最后一天
            YearMonth yearMonth = YearMonth.from(createTime);
            LocalDate lastDayOfMonth = yearMonth.atEndOfMonth();

            // 将最后一天转换为 LocalDateTime，并设置为当天的最后一秒 (23:59:59.999)
            endTime = lastDayOfMonth.atTime(LocalTime.MAX);
        }

        List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
                .eq(changeType != null, BalanceChangeRecord::getChangeType, changeType)
                .eq(createTime != null, BalanceChangeRecord::getCreateTime, localDateTime)
                .between(startTime != null, BalanceChangeRecord::getCreateTime, startTime, endTime)
                .eq(BalanceChangeRecord::getAppUserId, userId));

        List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -6,14 +6,14 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.service.OrderService;
import org.springframework.web.bind.annotation.*;
import vo.OrderDetailVO;
import com.ruoyi.vo.OrderDetailVO;
import com.ruoyi.order.vo.OrderVO;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import model.Order;
import com.ruoyi.model.Order;

import javax.annotation.Resource;
import java.util.List;

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderGoodController.java

@@ -5,7 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.order.service.OrderGoodService;
import model.OrderGood;
import com.ruoyi.model.OrderGood;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java

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

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.service.ShoppingCartService;
@@ -11,7 +10,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import model.ShoppingCart;
import com.ruoyi.model.ShoppingCart;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderGoodMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import model.OrderGood;
import com.ruoyi.model.OrderGood;

/**
 * <p>

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.vo.OrderVO;
import model.Order;
import com.ruoyi.model.Order;

import java.util.List;


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/RefundPassMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import model.RefundPass;
import com.ruoyi.model.RefundPass;

/**
 * <p>

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/ShoppingCartMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import model.ShoppingCart;
import com.ruoyi.model.ShoppingCart;

public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderGoodService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import model.OrderGood;
import com.ruoyi.model.OrderGood;

/**
 * <p>

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import vo.OrderDetailVO;
import com.ruoyi.vo.OrderDetailVO;
import com.ruoyi.order.vo.OrderVO;
import model.Order;
import com.ruoyi.model.Order;

import java.util.List;


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import model.RefundPass;
import com.ruoyi.model.RefundPass;

/**
 * <p>

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java

@@ -2,10 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.vo.*;
import model.ShoppingCart;
import org.springframework.web.bind.annotation.RequestBody;
import com.ruoyi.model.ShoppingCart;

import java.util.List;


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java

@@ -9,8 +9,8 @@
import com.ruoyi.order.service.OrderService;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.feignClient.ShopClient;
import model.Order;
import model.OrderGood;
import com.ruoyi.model.Order;
import com.ruoyi.model.OrderGood;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderGoodServiceImpl.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.service.OrderGoodService;
import model.OrderGood;
import com.ruoyi.model.OrderGood;
import org.springframework.stereotype.Service;

/**

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

@@ -15,8 +15,8 @@
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.service.OrderService;
import vo.OrderDetailVO;
import vo.OrderGoodsVO;
import com.ruoyi.vo.OrderDetailVO;
import com.ruoyi.vo.OrderGoodsVO;
import com.ruoyi.order.vo.OrderVO;
import com.ruoyi.other.api.domain.CouponInfo;
import com.ruoyi.other.api.domain.Goods;
@@ -24,8 +24,8 @@
import com.ruoyi.other.api.domain.Technician;
import com.ruoyi.other.api.feignClient.TechnicianClient;
import com.ruoyi.system.api.model.LoginUser;
import model.Order;
import model.OrderGood;
import com.ruoyi.model.Order;
import com.ruoyi.model.OrderGood;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.mapper.RefundPassMapper;
import com.ruoyi.order.service.RefundPassService;
import model.RefundPass;
import com.ruoyi.model.RefundPass;
import org.springframework.stereotype.Service;

/**

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -3,7 +3,6 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.*;
@@ -15,7 +14,6 @@
import com.ruoyi.account.api.vo.PaymentUserCoupon;
import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.mapper.ShoppingCartMapper;
import com.ruoyi.order.service.OrderGoodService;
@@ -27,11 +25,10 @@
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import model.Order;
import model.OrderGood;
import model.ShoppingCart;
import com.ruoyi.model.Order;
import com.ruoyi.model.OrderGood;
import com.ruoyi.model.ShoppingCart;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;