From f804e3c6a1e0c2ac7cbbb32502ed2d42861098c6 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 23 Nov 2023 14:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=89=E7=A9=B4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peanut/modules/book/entity/MyUserEntity.java | 6 ++++++ .../pay/alipay/controller/AliPayController.java | 1 - .../pay/alipay/service/impl/AliPayServiceImpl.java | 13 ++++++++++++- .../weChatPay/controller/WeChatPayController.java | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java b/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java index 41a95e23..173585bd 100644 --- a/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java @@ -82,6 +82,12 @@ public class MyUserEntity implements Serializable { */ private String yljkOid; + /** + * 是否有脉穴的查看权限 + */ + private Integer pointPower; + + /** * 创建时间 */ diff --git a/src/main/java/com/peanut/modules/pay/alipay/controller/AliPayController.java b/src/main/java/com/peanut/modules/pay/alipay/controller/AliPayController.java index 06558d65..4e80169b 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/controller/AliPayController.java +++ b/src/main/java/com/peanut/modules/pay/alipay/controller/AliPayController.java @@ -43,7 +43,6 @@ public class AliPayController { public R notify_url(HttpServletRequest request) { Map parameterMap = request.getParameterMap(); String jsonStr = JSONObject.toJSONString(parameterMap); - System.out.println("支付宝回调信息=============》"+jsonStr); String aliNotify = aliPayService.aliNotify(request); return R.ok().put("aliNotify",aliNotify); } diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index aa025d1d..60f1bdc8 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -4,9 +4,11 @@ package com.peanut.modules.pay.alipay.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alipay.api.internal.util.AlipaySignature; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.*; @@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * 支付宝支付实现 @@ -40,6 +43,8 @@ public class AliPayServiceImpl implements AliPayService { @Autowired private BookBuyConfigService bookBuyConfigService; @Autowired + private BuyOrderProductDao buyOrderProductDao; + @Autowired private TransactionDetailsService transactionDetailsService; @Autowired private PayPaymentOrderService payPaymentOrderService; @@ -87,7 +92,6 @@ public class AliPayServiceImpl implements AliPayService { @Override @Transactional public String aliNotify(HttpServletRequest request) { - log.info(">>>>>>>>>>支付宝异步回调开始<<<<<<<<<<"); Map params = new HashMap<>(); try { Map requestParams = request.getParameterMap(); @@ -211,6 +215,13 @@ public class AliPayServiceImpl implements AliPayService { userEbookBuyDao.insert(entity); } + List collect = buyOrderProductDao.selectList(new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, orderEntity.getOrderId())).stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList()); + if(collect.contains(128)||collect.contains(129)||collect.contains(130)){ + MyUserEntity userInfo = userService.getById(orderEntity.getUserId()); + userInfo.setPointPower(1); + userService.updateById(userInfo); + } + } 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 94895846..fc6c95fe 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 @@ -2,8 +2,10 @@ package com.peanut.modules.pay.weChatPay.controller; 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.pay.weChatPay.config.WechatPayConfig; @@ -22,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; @Slf4j @RestController @@ -35,6 +38,8 @@ public class WeChatPayController { @Autowired private BuyOrderService buyOrderService; + @Autowired + private BuyOrderProductDao buyOrderProductDao; @Autowired @Lazy @@ -145,6 +150,15 @@ public class WeChatPayController { userEbookBuyEntities.add(entity); } userEbookBuyService.saveBatch(userEbookBuyEntities); + //手摸脚模购买后会开启用户的脉穴的功能 + List collect = buyOrderProductDao.selectList(new LambdaQueryWrapper().eq(BuyOrderProduct::getOrderId, order.getOrderId())).stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList()); + if(collect.contains(128)||collect.contains(129)||collect.contains(130)){ + MyUserEntity userInfo = userService.getById(order.getUserId()); + userInfo.setPointPower(1); + userService.updateById(userInfo); + } + + buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "0"); } if ("point".equals(order.getOrderType())) {