1

src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java

@@ -3,8 +3,8 @@ package com.peanut.modules.pay.IOSPay.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.*;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.pay.IOSPay.Result;
 import com.peanut.modules.pay.IOSPay.constant.VerifyReceiptConstant;
 import com.peanut.modules.pay.IOSPay.model.dto.IapRequestDTO;

src/main/java/com/peanut/modules/pay/IOSPay/service/impl/OrderServiceImpl.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.Query;
-import com.peanut.modules.book.entity.BookBuyConfigEntity;
-import com.peanut.modules.book.entity.BuyOrder;
-import com.peanut.modules.book.entity.MyUserEntity;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.entity.BuyOrder;
+import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.book.service.BookBuyConfigService;
 import com.peanut.modules.book.service.BuyOrderService;
 import com.peanut.modules.book.service.MyUserService;

src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java

@@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.CopyUtils;
 import com.peanut.common.utils.OrderUtils;
-import com.peanut.modules.book.dao.BuyOrderProductDao;
-import com.peanut.modules.book.dao.ShopProductBookDao;
-import com.peanut.modules.book.dao.UserEbookBuyDao;
-import com.peanut.modules.book.entity.*;
+import com.peanut.modules.common.dao.BuyOrderProductDao;
+import com.peanut.modules.common.dao.ShopProductBookDao;
+import com.peanut.modules.common.dao.UserEbookBuyDao;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.pay.alipay.config.AliPayConfig;
 import com.peanut.modules.pay.alipay.config.AliPayUtil;
 import com.peanut.modules.pay.alipay.dto.AlipayDTO;

src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java

@@ -3,8 +3,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.DateUtils;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.pay.IOSPay.Result;
 import com.peanut.modules.pay.applePay.service.ApplePayService;
 import com.peanut.modules.pay.applePay.utils.*;

src/main/java/com/peanut/modules/pay/refund/service/PayRefundOrderService.java

@@ -2,7 +2,7 @@ package com.peanut.modules.pay.refund.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.BuyOrder;
+import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.pay.refund.entity.PayRefundOrder;
 import java.util.Map;
 

src/main/java/com/peanut/modules/pay/refund/service/impl/PayRefundOrderServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.pay.refund.dao.PayRefundOrderDao;
 import com.peanut.modules.pay.refund.entity.PayRefundOrder;
 import com.peanut.modules.pay.refund.service.PayRefundOrderService;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java

@@ -1,19 +1,13 @@
 package com.peanut.modules.pay.weChatPay.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.book.dao.BuyOrderProductDao;
-import com.peanut.modules.book.entity.*;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.BuyOrder;
+import com.peanut.modules.common.entity.PayWechatOrderEntity;
 import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
 import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
 import com.peanut.modules.pay.weChatPay.service.WxpayService;
-import com.peanut.modules.pay.weChatPay.util.HttpUtils;
-import com.peanut.modules.pay.weChatPay.util.WechatPayValidator;
 import com.peanut.modules.pay.weChatPay.util.WxPayUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RestController

src/main/java/com/peanut/modules/pay/weChatPay/service/WxpayService.java

@@ -1,12 +1,11 @@
 package com.peanut.modules.pay.weChatPay.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.peanut.modules.book.entity.PayWechatOrderEntity;
+import com.peanut.modules.common.entity.PayWechatOrderEntity;
 import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.util.Map;
 
 @Service

src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java

@@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.peanut.common.exception.RRException;
-import com.peanut.modules.book.dao.BuyOrderProductDao;
-import com.peanut.modules.book.dao.PayWechatOrderDao;
-import com.peanut.modules.book.entity.*;
+import com.peanut.modules.common.dao.BuyOrderProductDao;
+import com.peanut.modules.common.dao.PayWechatOrderDao;
 import com.peanut.modules.book.service.*;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.pay.refund.entity.PayRefundOrder;
 import com.peanut.modules.pay.refund.service.PayRefundOrderService;
 import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
@@ -26,7 +25,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;