From 5402c28b315eb4dd7bb600273ddc396fc927e5dc Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 20 Nov 2023 16:18:07 +0800 Subject: [PATCH] bug --- .../BookForumArticlesServiceController.java | 4 ++-- .../book/service/impl/BuyOrderServiceImpl.java | 7 +++++++ src/main/resources/application.yml | 2 +- src/main/resources/weChatConfig.properties | 14 +++++++------- 4 files changed, 17 insertions(+), 10 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 5134baf6..56d5c1dc 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java @@ -70,7 +70,7 @@ public class BookForumArticlesServiceController { wrapper.leftJoin(AuthorEntity.class,AuthorEntity::getId,BookEntity::getAuthorId); wrapper.eq(BookForumArticlesEntity::getDelflag,0); wrapper.eq(BookEntity::getDelFlag,0); - wrapper.eq(BookEntity::getState,0); + wrapper.eq(BookEntity::getState,1); Page bookForumArticlesEntityPage = bookForumArticlesDao.selectJoinPage(new Page<>(page, limit), BookForumArticlesEntity.class, wrapper); for (BookForumArticlesEntity b : bookForumArticlesEntityPage.getRecords()){ @@ -102,7 +102,7 @@ public class BookForumArticlesServiceController { wrapper.leftJoin(AuthorEntity.class,AuthorEntity::getId,BookEntity::getAuthorId); wrapper.eq(BookForumArticlesEntity::getDelflag,0); wrapper.eq(BookEntity::getDelFlag,0); - wrapper.eq(BookEntity::getState,0); + wrapper.eq(BookEntity::getState,1); wrapper.orderByDesc(BookForumArticlesEntity::getContlike); Page bookForumArticlesEntityPage = bookForumArticlesDao.selectJoinPage(new Page<>(page, limit), BookForumArticlesEntity.class, wrapper); diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 7828757f..4fbdb63a 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -384,6 +384,13 @@ public class BuyOrderServiceImpl extends ServiceImpl impl public Page getUserOrderList(UserOrderDto userOrderDto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BuyOrder::getUserId,userOrderDto.getUserId()); + wrapper.eq(BuyOrder::getOrderType,"order"); + if(userOrderDto.getOrderStatus()==null){ + Integer[] sts = {0,1,2,3}; + wrapper.in(BuyOrder::getOrderStatus,sts); + }else{ + wrapper.eq(BuyOrder::getOrderStatus,userOrderDto.getOrderStatus()); + } wrapper.eq(userOrderDto.getOrderStatus()!=null,BuyOrder::getOrderStatus,userOrderDto.getOrderStatus()); wrapper.orderByDesc(BuyOrder::getCreateTime); Page buyOrderPage = this.getBaseMapper().selectPage(new Page<>(userOrderDto.getPage(), userOrderDto.getLimit()), wrapper); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4b7d7a8c..ad28466c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ connection-timeout: 6000000ms spring: # 环境 dev|test|prod profiles: - active: dev + active: prod # jackson时间格式化 jackson: time-zone: GMT+8 diff --git a/src/main/resources/weChatConfig.properties b/src/main/resources/weChatConfig.properties index c95caf68..a24fe685 100644 --- a/src/main/resources/weChatConfig.properties +++ b/src/main/resources/weChatConfig.properties @@ -5,22 +5,22 @@ wxpay.mchId:1612860909 # ?? URL wxpay.payUrl:https://api.mch.weixin.qq.com/v3/pay/transactions/app # ???? -wxpay.notifyUrl:https://testapi.nuttyreading.com/pay/payNotify +wxpay.notifyUrl:https://api.nuttyreading.com/pay/payNotify # ?? url wxpay.refundNotifyUrl:http://pjm6m9.natappfree.cc/pay/refundNotify # key pem -#wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem +wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem #wxpay.keyPemPath:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem -wxpay.keyPemPath:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem +#wxpay.keyPemPath:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem # ??? wxpay.serialNo:679AECB2F7AC4183033F713828892BA640E4EEE3 # API v3 key wxpay.apiV3Key:4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF # ???? -#wxpay.wechatPayCertificateUrl:/usr/local/hs/peanut_book/target/classes/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem +wxpay.wechatPayCertificateUrl:/usr/local/hs/peanut_book/target/classes/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem #wxpay.wechatPayCertificateUrl:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem - wxpay.wechatPayCertificateUrl:D:/hs/nuttyreading-java/src/main/resources/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem +# wxpay.wechatPayCertificateUrl:D:/hs/nuttyreading-java/src/main/resources/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem # ?? url -#wxpay.privateKeyUrl:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem +wxpay.privateKeyUrl:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem #wxpay.privateKeyUrl:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem -wxpay.privateKeyUrl:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem \ No newline at end of file +#wxpay.privateKeyUrl:D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem \ No newline at end of file