dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/order/ShopOrderController.java

@@ -23,7 +23,7 @@ import com.ruoyi.shop.order.domain.bo.BusinessCountBo;
 import com.ruoyi.shop.order.domain.bo.ShopOrderBo;
 import com.ruoyi.shop.order.domain.bo.ShopOrderBusinessRemarkBo;
 import com.ruoyi.shop.order.domain.vo.*;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.TransactionStatus;
 import com.ruoyi.shop.order.service.IShopOrderService;
 import com.ruoyi.shop.rights.service.ISaleRightsOrderService;

ruoyi-api/src/main/java/com/ruoyi/api/controller/business/ApiBusinessDayBillController.java

@@ -7,6 +7,7 @@ import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillBo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
 import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
+import com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo;
 import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -59,6 +60,16 @@ public class ApiBusinessDayBillController extends AbstractApiController {
         return iBusinessDayBillService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 分页查询商家经营数据
+     */
+    @ApiOperation("分页查询商家经营数据")
+    @GetMapping("/salesPage")
+    public TableDataInfo<BusinessSalesDetailVo> salesPage(@Validated(QueryGroup.class) BusinessDayBillBo bo, PageQuery pageQuery) {
+       bo.setBusinessId(getBusinessByUserId(getUserId(true), true));
+        return iBusinessDayBillService.querySalesPageList(bo, pageQuery);
+    }
+
 
     /**
      * 导出商家日账单列表

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/ApiSaleRightsOrderController.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.FilePathSplicingType;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.rights.domain.bo.SaleRightsOrderBo;
 import com.ruoyi.shop.rights.domain.bo.SaleRightsOrderShipRecordBo;
 import com.ruoyi.shop.rights.domain.vo.RightsMoneyVo;

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/ApiShopOrderController.java

@@ -32,7 +32,7 @@ import com.ruoyi.shop.order.domain.bo.createorder.CreateOrderBo;
 import com.ruoyi.shop.order.domain.vo.ShopOrderCountVo;
 import com.ruoyi.shop.order.domain.vo.ShopOrderTransactionStatusCountVo;
 import com.ruoyi.shop.order.domain.vo.ShopOrderVo;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.PaymentMethod;
 import com.ruoyi.shop.order.enums.PaymentStatus;
 import com.ruoyi.shop.order.enums.TransactionStatus;

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/vo/BusinessSalesDetailVo.java

@@ -0,0 +1,55 @@
+package com.ruoyi.businessDayBill.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.common.enums.order.OrderType;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel("商家经营明细视图对象")
+@ExcelIgnoreUnannotated
+@Data
+public class BusinessSalesDetailVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 商家ID
+     */
+    private Long businessId;
+
+    /**
+     * 商家名称
+     */
+    private String businessName;
+
+
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 商家所得
+     */
+    private BigDecimal businessIncome;
+
+
+    /**
+     * 订单时间
+     */
+    private Date paymentTime;
+
+    /**
+     * 订单类型(0普通订单,2服务商品订单)
+     */
+    private OrderType orderType;
+}

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/mapper/BusinessDayBillMapper.java

@@ -1,9 +1,11 @@
 package com.ruoyi.businessDayBill.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.businessDayBill.domain.BusinessDayBill;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillBo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
 import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
+import com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +24,6 @@ public interface BusinessDayBillMapper extends BaseMapperPlus<BusinessDayBillMap
     List<BusinessDayBillVo> onYear(@Param("bo")BusinessDayBillCountBo bo);
 
     List<BusinessDayBillVo> onDay(@Param("bo")BusinessDayBillCountBo build);
+
+    Page<BusinessSalesDetailVo> querySalesPageList(Page<BusinessSalesDetailVo> build, @Param("bo")BusinessDayBillBo bo);
 }

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/IBusinessDayBillService.java

@@ -5,6 +5,7 @@ import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillChangeBo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
 import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillBo;
+import com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 
@@ -145,4 +146,11 @@ public interface IBusinessDayBillService {
      * @return 统计信息
      */
     List<BusinessDayBillVo> onDay(BusinessDayBillCountBo build);
+
+    /**
+     * 获取商家经营
+     * @param bo 统计参数
+     * @return 统计信息
+     */
+    TableDataInfo<BusinessSalesDetailVo> querySalesPageList(BusinessDayBillBo bo, PageQuery pageQuery);
 }

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/impl/BusinessDayBillServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.business.domain.OnLineOrderProperties;
 import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillChangeBo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
+import com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.MathUtils;
@@ -329,5 +330,11 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
         return this.baseMapper.onDay(build);
     }
 
+    @Override
+    public TableDataInfo<BusinessSalesDetailVo> querySalesPageList(BusinessDayBillBo bo, PageQuery pageQuery) {
+        Page<BusinessSalesDetailVo> result = baseMapper.querySalesPageList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
 
 }

ruoyi-business/src/main/resources/mapper/businessDayBill/BusinessDayBillMapper.xml

@@ -132,4 +132,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY bill_day
     </select>
+
+    <select id="querySalesPageList" resultType="com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo">
+        select * from (select order_id,order_no,business_id,business_name,  business_income,payment_time,order_type from tb_shop_order
+                       union all
+                       select order_id,order_no,business_id,business_name, business_income,pay_time as payment_time,order_type from  tb_online_order) as o
+        <where>
+        <if test="bo.businessId!=null">
+            and business_id = #{bo.businessId}
+        </if>
+        </where>
+        order by payment_time desc
+    </select>
 </mapper>

ruoyi-shop/src/main/java/com/ruoyi/shop/order/enums/OrderType.java

@@ -1,11 +1,11 @@
-package com.ruoyi.shop.order.enums;
+package com.ruoyi.common.enums.order;
 
 import com.ruoyi.common.enums.IIntegerEnum;
 
 import java.util.Objects;
 
 /**
- * @Description: 订单类型(0普通订单,2服务商品订单)
+ * @Description: 订单类型(0普通订单,2服务商品订单,3扫码到店订单)
  * @Author:  gj
  * @CreateDate:     2020/7/15 15:01
  * @UpdateUser:     gj

ruoyi-line/src/main/java/com/ruoyi/onlineorder/domain/OnlineOrder.java

@@ -2,25 +2,17 @@ package com.ruoyi.onlineorder.domain;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
-import com.ruoyi.common.convert.ExcelDateTimeConvert;
 import com.ruoyi.common.core.domain.BaseTimeEntity;
 import com.ruoyi.common.enums.CallInterfaceStatus;
 import com.ruoyi.onlineorder.enums.*;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.system.enums.SequencePrefixEnum;
 import com.ruoyi.system.service.ISysSequenceService;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
-import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.math.BigDecimal;
 
 /**
  * 在线订单对象 tb_online_order
@@ -162,6 +154,10 @@ public class OnlineOrder extends BaseTimeEntity {
      */
     private CallInterfaceStatus platformIncomeSettled;
 
+    /**
+     * 订单类型(0普通订单,2服务商品订单)
+     */
+    private OrderType orderType;
 
     public void init(Integer expireMinute) {
         this.orderStatus = OnlineOrderStatus.WAIT_PAY;
@@ -177,6 +173,7 @@ public class OnlineOrder extends BaseTimeEntity {
         this.businessIncome = BigDecimal.ZERO;
         this.platformIncome = BigDecimal.ZERO;
         this.platformIncomeSettled = CallInterfaceStatus.NO;
+        this.orderType = OrderType.ONLINE;
     }
 
     /**

ruoyi-line/src/main/java/com/ruoyi/onlineorder/domain/bo/OnlineOrderBo.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.CallInterfaceStatus;
 import com.ruoyi.onlineorder.enums.*;
+import com.ruoyi.common.enums.order.OrderType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,9 +15,8 @@ import javax.validation.constraints.*;
 import java.util.Date;
 
 import java.math.BigDecimal;
-import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -216,6 +216,12 @@ public class OnlineOrderBo extends BaseTimeEntity {
     @ApiModelProperty(value = "平台所得是否已分账")
     private CallInterfaceStatus platformIncomeSettled;
 
+    /**
+     * 订单类型(0普通订单,2服务商品订单)
+     */
+    @ApiModelProperty(value = "订单类型(0普通订单,2服务商品订单,3扫码到店订单)", required = true)
+    private OrderType orderType;
+
     /**
      * 订单支付开始时间
      */

ruoyi-line/src/main/java/com/ruoyi/onlineorder/domain/vo/OnlineOrderVo.java

@@ -4,20 +4,17 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import cn.hutool.extra.spring.SpringUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDateTimeConvert;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.common.core.domain.BaseVo;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.CallInterfaceStatus;
 import com.ruoyi.onlineorder.enums.*;
 import com.ruoyi.onlinerefundorder.domain.vo.OnlineRefundOrderVo;
 import com.ruoyi.onlinerefundorder.service.IOnlineRefundOrderService;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.subsidy.domain.vo.SubsidyQueueVo;
 import com.ruoyi.subsidy.enums.SubsidyStatus;
 import com.ruoyi.subsidy.service.ISubsidyQueueService;
@@ -25,9 +22,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
 
 /**
  * 在线订单视图对象 tb_online_order
@@ -278,6 +272,10 @@ public class OnlineOrderVo extends BaseVo {
     @ApiModelProperty(value = "退款订单信息")
     private OnlineRefundOrderVo onlineRefundOrderVo;
 
+    /**
+     * 订单类型(0普通订单,2服务商品订单)
+     */
+    private OrderType orderType;
     /**
      * 加载退款订单信息
      */

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/impl/OnlineOrderServiceImpl.java

@@ -38,8 +38,7 @@ import com.ruoyi.onlineorder.mapper.OnlineOrderMapper;
 import com.ruoyi.onlineorder.service.IOnlineOrderService;
 import com.ruoyi.shop.business.domain.bo.UserBusinessChangeIntegralBo;
 import com.ruoyi.shop.business.service.IUserBusinessRoleService;
-import com.ruoyi.shop.order.domain.vo.ShopOrderVo;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.subsidy.domain.SubsidyMode;
 import com.ruoyi.subsidy.service.ISubsidyModeService;
 import com.ruoyi.subsidy.service.ISubsidyQueueService;

ruoyi-line/src/main/resources/mapper/onlineorder/OnlineOrderMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessIncome" column="business_income"/>
         <result property="platformServiceFee" column="platform_service_fee"/>
         <result property="businessShouldSubsidy" column="business_should_subsidy"/>
+        <result property="orderType" column="order_type"/>
     </resultMap>
 
     <select id="payAmountTotal" resultType="java.math.BigDecimal">

ruoyi-shop/src/main/java/com/ruoyi/shop/business/service/IUserBusinessRoleService.java

@@ -11,7 +11,7 @@ import com.ruoyi.shop.business.domain.vo.UserBusinessRoleVo;
 import com.ruoyi.shop.business.domain.vo.UserBusinessVerifierIntegralStatisticsVo;
 import com.ruoyi.shop.business.domain.vo.UserBusinessVerifierIntegralVo;
 import com.ruoyi.shop.order.domain.bo.BusinessCountBo;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.user.domain.vo.UserVo;
 
 import java.math.BigDecimal;

ruoyi-shop/src/main/java/com/ruoyi/shop/business/service/impl/UserBusinessRoleServiceImpl.java

@@ -36,7 +36,7 @@ import com.ruoyi.shop.business.mapper.UserBusinessRoleMapper;
 import com.ruoyi.shop.business.service.IUserBusinessIntegralRecordService;
 import com.ruoyi.shop.business.service.IUserBusinessRoleService;
 import com.ruoyi.shop.order.domain.bo.BusinessCountBo;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.user.domain.User;
 import com.ruoyi.user.domain.vo.UserVo;

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/ShopOrder.java

@@ -4,17 +4,16 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.core.domain.BaseTimeEntity;
 import com.ruoyi.common.enums.CallInterfaceStatus;
 import com.ruoyi.common.enums.order.MarketingType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.*;
 import com.ruoyi.shop.order.service.IShopOrderDetailService;
 import com.ruoyi.shop.product.IProductInnerApi;
 import com.ruoyi.system.enums.SequencePrefixEnum;
 import com.ruoyi.system.service.ISysSequenceService;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -22,10 +21,6 @@ import java.math.BigDecimal;
 
 import java.util.List;
 
-import com.ruoyi.common.core.domain.BaseEntity;
-
-import javax.validation.constraints.NotBlank;
-
 /**
  * 订单对象 tb_shop_order
  *

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/bo/ShopOrderBo.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.CallInterfaceStatus;
 import com.ruoyi.common.enums.order.MarketingType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.shop.order.enums.*;
 import io.swagger.annotations.ApiModel;

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/bo/createorder/CreateOrderBo.java

@@ -4,7 +4,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.order.MarketingType;
 import com.ruoyi.shop.order.enums.ChannelType;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.ShippingMethod;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderVo.java

@@ -17,6 +17,7 @@ import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.common.core.domain.BaseVo;
 import com.ruoyi.common.enums.CallInterfaceStatus;
 import com.ruoyi.common.enums.order.MarketingType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.shop.order.enums.*;
 import com.ruoyi.shop.order.service.*;

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +15,7 @@ import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillChangeBo;
 import com.ruoyi.businessDayBill.enums.BusinessDayBillChangeType;
 import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
 import com.ruoyi.common.enums.CallInterfaceStatus;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.common.utils.MathUtils;
 import com.ruoyi.fubeiPay.domain.PayBo;
 import com.ruoyi.fubeiPay.service.FubeiPayService;

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/SaleRightsOrder.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.common.utils.ClassConvertUtils;
 import com.ruoyi.shop.enums.*;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.PaymentMethod;
 import com.ruoyi.shop.order.enums.RightsMethod;
 import com.ruoyi.shop.rights.service.ISaleRightsOrderDetailService;

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/bo/SaleRightsOrderBo.java

@@ -6,7 +6,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
 import com.ruoyi.shop.enums.*;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.PaymentMethod;
 import com.ruoyi.shop.order.enums.RightsMethod;
 import io.swagger.annotations.ApiModel;

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/domain/vo/SaleRightsOrderVo.java

@@ -14,7 +14,7 @@ import com.ruoyi.shop.enums.RightsOperatePerson;
 import com.ruoyi.shop.enums.RightsOperateStatus;
 import com.ruoyi.shop.enums.RightsRefundStatus;
 import com.ruoyi.shop.order.domain.vo.ShopOrderVo;
-import com.ruoyi.shop.order.enums.OrderType;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.shop.order.enums.PaymentMethod;
 import com.ruoyi.shop.order.enums.RightsMethod;
 import com.ruoyi.shop.order.service.IShopOrderService;

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/service/impl/SaleRightsOrderServiceImpl.java

@@ -16,6 +16,7 @@ import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.order.OrderType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.DateUtils;
@@ -24,7 +25,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.fubeiPay.domain.PayBo;
 import com.ruoyi.fubeiPay.service.FubeiPayService;
 import com.ruoyi.newwxpay.refund.RefundNotifyResult;
-import com.ruoyi.newwxpay.refund.WxMinRefundRequest;
 import com.ruoyi.newwxpay.service.NewWxPayService;
 import com.ruoyi.shop.business.domain.bo.UserBusinessChangeIntegralBo;
 import com.ruoyi.shop.business.service.IUserBusinessRoleService;