调整实体类包层级

mitao

2024-05-30 42968e8f0f6342918072fac93f1c7549b52d49a5

调整实体类包层级

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java

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


import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.MemberInvoice;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.service.IMemberInvoiceService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
import org.apache.poi.ss.formula.functions.T;
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceOrderController.java

@@ -3,17 +3,16 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceRiseController.java

@@ -3,7 +3,7 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.service.IMemberInvoiceRiseService;
import com.ruoyi.order.service.IOrderService;
@@ -11,7 +11,11 @@
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/InvoicingApplication.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

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

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoice.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

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

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoiceOrder.java
@@ -1,12 +1,12 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/MemberInvoiceRise.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

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

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

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

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderMall.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

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

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderReturnRequest.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

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

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Paylog.java
@@ -1,12 +1,12 @@
package com.ruoyi.order.domain.pojo;
package com.ruoyi.order.domain;

import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
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;

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

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

import com.ruoyi.order.domain.pojo.InvoicingApplication;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.InvoicingApplication;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.MemberInvoice;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.MemberInvoiceOrder;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.MemberInvoiceRise;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.OrderAuction;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.OrderAuction;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.OrderMall;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.OrderMall;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.OrderReturnRequest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.OrderReturnRequest;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.Paylog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.Paylog;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.InvoicingApplication;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.InvoicingApplication;

/**
 * <p>

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

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

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.dto.MemberInvoiceDTO;

import java.util.List;

/**
 * <p>

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.system.api.domain.Order;


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

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

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.MemberInvoice;
import com.ruoyi.order.dto.MemberInvoiceDTO;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.OrderAuction;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.OrderAuction;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.OrderMall;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.OrderMall;

/**
 * <p>

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

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

import com.ruoyi.order.domain.pojo.OrderReturnRequest;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.OrderReturnRequest;

/**
 * <p>

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.domain.pojo.Paylog;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import java.util.List;
import java.util.Map;

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

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

import com.ruoyi.order.domain.pojo.InvoicingApplication;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.InvoicingApplication;
import com.ruoyi.order.mapper.InvoicingApplicationMapper;
import com.ruoyi.order.service.IInvoicingApplicationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**

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

@@ -3,17 +3,14 @@
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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceOrderMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import org.springframework.stereotype.Service;

/**
 * <p>

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

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoiceRise;
import com.ruoyi.order.domain.MemberInvoiceRise;
import com.ruoyi.order.dto.MemberInvoiceRiseDTO;
import com.ruoyi.order.mapper.MemberInvoiceRiseMapper;
import com.ruoyi.order.service.IMemberInvoiceRiseService;

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

@@ -8,10 +8,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.domain.pojo.MemberInvoiceOrder;
import com.ruoyi.order.domain.pojo.OrderAuction;
import com.ruoyi.order.domain.pojo.OrderMall;
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;

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

@@ -9,7 +9,7 @@
import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.pojo.Paylog;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.order.service.IPaylogService;

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

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

import com.ruoyi.order.domain.pojo.OrderAuction;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.OrderAuction;
import com.ruoyi.order.mapper.OrderAuctionMapper;
import com.ruoyi.order.service.IOrderAuctionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**

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

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

import com.ruoyi.order.domain.pojo.OrderMall;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.mapper.OrderMallMapper;
import com.ruoyi.order.service.IOrderMallService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**

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

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

import com.ruoyi.order.domain.pojo.OrderReturnRequest;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.OrderReturnRequest;
import com.ruoyi.order.mapper.OrderReturnRequestMapper;
import com.ruoyi.order.service.IOrderReturnRequestService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.order.domain.pojo.OrderMall;
import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;

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

@@ -13,7 +13,7 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.pojo.Paylog;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.PaylogMapper;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.SinataUtil;
@@ -24,9 +24,9 @@
import com.ruoyi.order.util.tencent.common.XMLParser;
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.BondVO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.feignClient.OrderClient;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
@@ -45,8 +45,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.system.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;

/**

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

@@ -4,13 +4,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.promotion.service.ICouponMemberService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionBannerController.java

@@ -2,17 +2,15 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.PromotionBanner;
import com.ruoyi.promotion.service.IPromotionBannerService;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;

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

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

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionWishListController.java

@@ -4,15 +4,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.service.IPromotionWishListService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/Coupon.java

File was renamed from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/Coupon.java
@@ -1,4 +1,4 @@
package com.ruoyi.promotion.domain.pojo;
package com.ruoyi.promotion.domain;

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

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/CouponMember.java

File was renamed from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
@@ -1,4 +1,4 @@
package com.ruoyi.promotion.domain.pojo;
package com.ruoyi.promotion.domain;

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

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/PromotionBanner.java

File was renamed from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionBanner.java
@@ -1,4 +1,4 @@
package com.ruoyi.promotion.domain.pojo;
package com.ruoyi.promotion.domain;

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

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/PromotionWishList.java

File was renamed from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionWishList.java
@@ -1,4 +1,4 @@
package com.ruoyi.promotion.domain.pojo;
package com.ruoyi.promotion.domain;

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

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/CouponMapper.java

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

import com.ruoyi.promotion.domain.pojo.Coupon;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.promotion.domain.Coupon;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/CouponMemberMapper.java

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

import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.promotion.domain.CouponMember;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionBannerMapper.java

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

import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.promotion.domain.PromotionBanner;

/**
 * <p>

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/mapper/PromotionWishListMapper.java

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

import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.promotion.domain.PromotionWishList;

/**
 * <p>

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import com.ruoyi.promotion.domain.CouponMember;

/**
 * <p>

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

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

import com.ruoyi.promotion.domain.pojo.Coupon;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.promotion.domain.Coupon;

/**
 * <p>

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

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

import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.bind.annotation.PathVariable;

import com.ruoyi.promotion.domain.PromotionBanner;
import java.util.List;

/**

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import com.ruoyi.promotion.domain.PromotionWishList;

/**
 * <p>

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

@@ -3,19 +3,16 @@
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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.CouponMember;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.MemberAddress;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * <p>

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

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

import com.ruoyi.promotion.domain.pojo.Coupon;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.promotion.domain.Coupon;
import com.ruoyi.promotion.mapper.CouponMapper;
import com.ruoyi.promotion.service.ICouponService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**

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

@@ -2,14 +2,13 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.promotion.domain.PromotionBanner;
import com.ruoyi.promotion.mapper.PromotionBannerMapper;
import com.ruoyi.promotion.service.IPromotionBannerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;

/**
 * <p>

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

@@ -3,22 +3,19 @@
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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.promotion.controller.dto.PromotionWishListDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.domain.pojo.PromotionWishList;
import com.ruoyi.promotion.domain.PromotionWishList;
import com.ruoyi.promotion.mapper.PromotionWishListMapper;
import com.ruoyi.promotion.service.IPromotionWishListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import util.HuaWeiOBSUtil;

import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import util.HuaWeiOBSUtil;

/**
 * <p>