From b18fc6cff98185e4c069d1c9e1fa0f6d981b6f5c Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Sat, 7 Oct 2023 17:22:58 +0800
Subject: [PATCH] remove unused import

---
 .../BookForumArticlesServiceController.java   | 39 -------------------
 .../book/service/BuyOrderDetailService.java   |  2 +-
 .../controller/WeChatPayController.java       | 31 ++++++++++-----
 .../mapper/book/ShopProudictBookDao.xml       | 11 ++++++
 .../resources/mapper/book/UserEbookBuyDao.xml |  4 ++
 5 files changed, 38 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java b/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java
index e7e54b4e..bfa1ce30 100644
--- a/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java
@@ -341,12 +341,6 @@ public class BookForumArticlesServiceController {
                 bookForumArticlesVO.setCreate_time(createTime);
                 list.add(bookForumArticlesVO);
                 System.out.println(list);
-
-
-
-
-
-
             }
 
         }
@@ -367,9 +361,6 @@ public class BookForumArticlesServiceController {
         return R.ok().put("BookForumArticlesEntity", forumArticles);
     }
 
-
-
-
     /**
      * app信息
      */
@@ -380,9 +371,6 @@ public class BookForumArticlesServiceController {
         return R.ok().put("BookForumArticlesEntity", forumArticles);
     }
 
-
-
-
     /**
      * 手动输入
      */
@@ -395,23 +383,6 @@ public class BookForumArticlesServiceController {
         return R.ok();
     }
 
-
-
-
-
-//    /**
-//     * 列表  (修改时间倒叙)  app页面
-//     */
-//    @RequestMapping("/importlist")
-//    public R importlist(@RequestParam Map<String, Object> params){
-//
-//        PageUtils page = bookForumArticlesService.importlistqueryPages(params);
-//        return R.ok().put("page", page);
-//    }
-
-
-
-
     /**
      * 导入
      */
@@ -425,16 +396,6 @@ public class BookForumArticlesServiceController {
         return R.ok();
     }
 
-
-
-
-
-
-
-
-
-
-
     /**
      * 修改
      */
diff --git a/src/main/java/com/peanut/modules/book/service/BuyOrderDetailService.java b/src/main/java/com/peanut/modules/book/service/BuyOrderDetailService.java
index 09d1cbb9..0ef452bf 100644
--- a/src/main/java/com/peanut/modules/book/service/BuyOrderDetailService.java
+++ b/src/main/java/com/peanut/modules/book/service/BuyOrderDetailService.java
@@ -20,8 +20,8 @@ public interface BuyOrderDetailService extends IService<BuyOrderDetailEntity> {
     PageUtils querySheet(Map<String, Object> params);
 
     PageUtils querybuy(Map<String,Object>params);
+
     PageUtils querybuyss(Map<String,Object>params);
 
     public void batchUpdateByShippingSns(String[] shippingSnList);
 }
-
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
index fdf90763..d427a04d 100644
--- a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
@@ -61,13 +61,20 @@ public class WeChatPayController {
     @Lazy
     private WechatPayConfig wechatPayConfig;
 
-    @Autowired private BookBuyConfigService bookBuyConfigService;
+    @Autowired
+    private BookBuyConfigService bookBuyConfigService;
 
-    @Autowired private PayWechatOrderService payWechatOrderService;
+    @Autowired
+    private PayWechatOrderService payWechatOrderService;
 
-    @Autowired private PayPaymentOrderService payPaymentOrderService;
+    @Autowired
+    private PayPaymentOrderService payPaymentOrderService;
 
-    @Autowired private TransactionDetailsService transactionDetailsService;
+    @Autowired
+    private TransactionDetailsService transactionDetailsService;
+
+    @Autowired
+    private BuyOrderDetailService buyOrderDetailService;
 
     @Autowired
     private CloseableHttpClient wxPayNoSignClient; //无需应答签名
@@ -85,11 +92,6 @@ public class WeChatPayController {
     // 微信下单Url
     public static final String payUrl = "https://api.mch.weixin.qq.com/v3/pay/transactions/app";
 
-
-
-
-
-
     /**
      * App 微信下单
      *
@@ -263,7 +265,18 @@ public class WeChatPayController {
                 if("order".equals(order.getOrderType())){
                     BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", wechatEntity.getOrderSn()));
                     BigDecimal realMoney = orderEntity.getRealMoney();
+
                     //更新 订单 记录
+                    // 1. 根据订单 ID 查询订单详情
+                    // 2. 由订单详情获取商品信息
+                    // 3. 查询商品信息得到 book_id
+                    // 4. 查询用户的所有 book_id
+                    // 5. 取差集
+                    /*
+                    list1.removeAll(list2)
+                     */
+                    // 6. 为用户添加书籍
+
                     if (wechatEntity.getTotalAmount().compareTo(realMoney) == 0) {
                         buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"0");
                     }
diff --git a/src/main/resources/mapper/book/ShopProudictBookDao.xml b/src/main/resources/mapper/book/ShopProudictBookDao.xml
index 85649f0b..7aa7e7e5 100644
--- a/src/main/resources/mapper/book/ShopProudictBookDao.xml
+++ b/src/main/resources/mapper/book/ShopProudictBookDao.xml
@@ -13,6 +13,17 @@
         <result property="bookdIds" column="book_ids"/>
     </resultMap>
 
+    <!--
+        SELECT
+	spb.*
+FROM
+	shop_proudict_book spb
+	LEFT JOIN buy_order_detail bod ON spb.proudict_id = bod.product_id
+	LEFT JOIN buy_order bo ON bo.order_id = bod.order_id
+WHERE
+	bo.order_sn = '202305291720149121663113008012001282'
+    -->
+
 
 
 
diff --git a/src/main/resources/mapper/book/UserEbookBuyDao.xml b/src/main/resources/mapper/book/UserEbookBuyDao.xml
index ab7771a3..a289fe4f 100644
--- a/src/main/resources/mapper/book/UserEbookBuyDao.xml
+++ b/src/main/resources/mapper/book/UserEbookBuyDao.xml
@@ -16,5 +16,9 @@
         <result property="author" column="author"/>
     </resultMap>
 
+    <!--
+    select book_id from user_ebook_buy where user_id = '10169'
+    -->
+
 
 </mapper>
\ No newline at end of file