diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0c5b6668..aade46df 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,9 +10,7 @@
-
-
-
+
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cb7df820..7b1909c8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,32 +1,250 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
@@ -55,16 +273,13 @@
-
-
-
-
+
-
-
+
+
@@ -72,23 +287,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -97,13 +330,19 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -123,6 +362,15 @@
+ book/bookchapter
+ 未购买
+ 签到
+ catalogueEntity
+ Append
+ shop-categorytree
+ save
+ mybatis
+ 验证码
/sms/sendcode
账户余额不足
余额不足
@@ -144,15 +392,6 @@
shopproduct
book/book
record/All
- book/shopproduct
- buy/record
- 赠送
- book/bookchapter
- book/task
- 签到
- 精选
- bookinfolists
- 购买
@@ -166,14 +405,22 @@
+
+
+
@@ -255,12 +497,13 @@
-
-
+
+
-
+
+
@@ -417,6 +660,13 @@
+
+
+
+
+
+
+
@@ -430,41 +680,32 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -511,18 +752,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -586,16 +815,16 @@
+
+
+
-
-
-
@@ -617,6 +846,7 @@
+
@@ -929,8 +1159,8 @@
-
-
+
+
1663124293206
@@ -1311,7 +1541,7 @@
-
+
@@ -1332,18 +1562,18 @@
-
+
-
+
-
-
+
+
@@ -1353,9 +1583,9 @@
-
+
-
+
@@ -1426,7 +1656,7 @@
-
+
@@ -1439,30 +1669,6 @@
-
-
-
+
+
+
@@ -1498,33 +1713,23 @@
jar://$MAVEN_REPOSITORY$/com/github/wechatpay-apiv3/wechatpay-apache-httpclient/0.4.9/wechatpay-apache-httpclient-0.4.9.jar!/com/wechat/pay/contrib/apache/httpclient/auth/WechatPay2Validator.class
36
-
jar://$MAVEN_REPOSITORY$/com/github/wechatpay-apiv3/wechatpay-apache-httpclient/0.4.9/wechatpay-apache-httpclient-0.4.9.jar!/com/wechat/pay/contrib/apache/httpclient/auth/WechatPay2Validator.class
46
-
file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/UEditorUpload.java
22
-
file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/MyUserController.java
202
-
-
- file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookChapterController.java
- 159
-
-
-
@@ -1545,6 +1750,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1552,6 +1893,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1559,6 +1993,13 @@
+
+
+
+
+
+
+
@@ -1573,9 +2014,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1589,26 +2072,33 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
@@ -1616,305 +2106,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/peanut_book.iml b/peanut_book.iml
index 133d4bba..afb8874f 100644
--- a/peanut_book.iml
+++ b/peanut_book.iml
@@ -1,276 +1,8 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java
index a698f249..7c9f3a01 100644
--- a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java
+++ b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java
@@ -206,6 +206,36 @@ public class ShopProductController {
}
return R.ok().put("result", result);
}
+
+
+ /**
+ * 获取关联订单列表
+ * @param productId
+ * @return
+ */
+ @RequestMapping("/getGlProductList")
+ public R getGlProductList(@RequestParam int productId) {
+ //获取此商品下的books
+ List ids = shopProudictBookService.getBookidsByProductId(productId);
+
+ List ss = shopProudictBookService.getBaseMapper().selectList(new QueryWrapper()
+ .eq("del_flag",0)
+ .in("book_id",ids)
+ .groupBy("proudict_id")
+ .having("count(proudict_id) >="+ids.size())
+ );
+
+ List frag = new ArrayList<>();
+
+ for (ShopProudictBookEntity spbe : ss){
+ ShopProductEntity ca_sp = shopProductService.getById(spbe.getProudictId());
+ frag.add(ca_sp);
+ }
+
+ return R.ok().put("result",frag);
+
+ }
+
/**
* 信息
* @param productId
diff --git a/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java b/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java
index e9773622..e6ebafbc 100644
--- a/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java
+++ b/src/main/java/com/peanut/modules/book/service/ShopProudictBookService.java
@@ -15,4 +15,6 @@ public interface ShopProudictBookService extends IService getCartList(Integer proudictId);
+ List getBookidsByProductId(Integer productId);
+
}
diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java
index 5ba45a68..a1585c94 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProudictBookServiceImpl.java
@@ -71,4 +71,16 @@ public class ShopProudictBookServiceImpl extends ServiceImpl getBookidsByProductId(Integer productId) {
+ List spbs = this.list(new QueryWrapper().eq("del_flag",0).eq("proudict_id",productId));
+ List ids = new ArrayList();
+ for (ShopProudictBookEntity s : spbs){
+ ids.add(s.getBookId());
+ }
+ return ids;
+ }
+
+
}
diff --git a/src/main/resources/weChatConfig.properties b/src/main/resources/weChatConfig.properties
index 115c4a08..609b54c7 100644
--- a/src/main/resources/weChatConfig.properties
+++ b/src/main/resources/weChatConfig.properties
@@ -16,7 +16,8 @@ wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
# 密钥路径,resources下 /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
-wxpay.keyPemPath:C:/Users/Administrator/IdeaProjects/peanut_book/src/main/resources/cent/apiclient_key.pem
+#wxpay.keyPemPath:C:/Users/Administrator/IdeaProjects/peanut_book/src/main/resources/cent/apiclient_key.pem
+wxpay.keyPemPath:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
#商户证书序列号
wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
#微信服务器地址