脉穴功能
This commit is contained in:
@@ -82,6 +82,12 @@ public class MyUserEntity implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String yljkOid;
|
private String yljkOid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否有脉穴的查看权限
|
||||||
|
*/
|
||||||
|
private Integer pointPower;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ public class AliPayController {
|
|||||||
public R notify_url(HttpServletRequest request) {
|
public R notify_url(HttpServletRequest request) {
|
||||||
Map<String, String[]> parameterMap = request.getParameterMap();
|
Map<String, String[]> parameterMap = request.getParameterMap();
|
||||||
String jsonStr = JSONObject.toJSONString(parameterMap);
|
String jsonStr = JSONObject.toJSONString(parameterMap);
|
||||||
System.out.println("支付宝回调信息=============》"+jsonStr);
|
|
||||||
String aliNotify = aliPayService.aliNotify(request);
|
String aliNotify = aliPayService.aliNotify(request);
|
||||||
return R.ok().put("aliNotify",aliNotify);
|
return R.ok().put("aliNotify",aliNotify);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,11 @@ package com.peanut.modules.pay.alipay.service.impl;
|
|||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.alipay.api.internal.util.AlipaySignature;
|
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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.peanut.common.utils.CopyUtils;
|
import com.peanut.common.utils.CopyUtils;
|
||||||
import com.peanut.common.utils.OrderUtils;
|
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.ShopProductBookDao;
|
||||||
import com.peanut.modules.book.dao.UserEbookBuyDao;
|
import com.peanut.modules.book.dao.UserEbookBuyDao;
|
||||||
import com.peanut.modules.book.entity.*;
|
import com.peanut.modules.book.entity.*;
|
||||||
@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付宝支付实现
|
* 支付宝支付实现
|
||||||
@@ -40,6 +43,8 @@ public class AliPayServiceImpl implements AliPayService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private BookBuyConfigService bookBuyConfigService;
|
private BookBuyConfigService bookBuyConfigService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
private BuyOrderProductDao buyOrderProductDao;
|
||||||
|
@Autowired
|
||||||
private TransactionDetailsService transactionDetailsService;
|
private TransactionDetailsService transactionDetailsService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private PayPaymentOrderService payPaymentOrderService;
|
private PayPaymentOrderService payPaymentOrderService;
|
||||||
@@ -87,7 +92,6 @@ public class AliPayServiceImpl implements AliPayService {
|
|||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public String aliNotify(HttpServletRequest request) {
|
public String aliNotify(HttpServletRequest request) {
|
||||||
log.info(">>>>>>>>>>支付宝异步回调开始<<<<<<<<<<");
|
|
||||||
Map<String, String> params = new HashMap<>();
|
Map<String, String> params = new HashMap<>();
|
||||||
try {
|
try {
|
||||||
Map requestParams = request.getParameterMap();
|
Map requestParams = request.getParameterMap();
|
||||||
@@ -211,6 +215,13 @@ public class AliPayServiceImpl implements AliPayService {
|
|||||||
userEbookBuyDao.insert(entity);
|
userEbookBuyDao.insert(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<Integer> collect = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ package com.peanut.modules.pay.weChatPay.controller;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.alibaba.fastjson.TypeReference;
|
import com.alibaba.fastjson.TypeReference;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.peanut.common.utils.R;
|
import com.peanut.common.utils.R;
|
||||||
|
import com.peanut.modules.book.dao.BuyOrderProductDao;
|
||||||
import com.peanut.modules.book.entity.*;
|
import com.peanut.modules.book.entity.*;
|
||||||
import com.peanut.modules.book.service.*;
|
import com.peanut.modules.book.service.*;
|
||||||
import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
|
import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
|
||||||
@@ -22,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController
|
@RestController
|
||||||
@@ -35,6 +38,8 @@ public class WeChatPayController {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private BuyOrderService buyOrderService;
|
private BuyOrderService buyOrderService;
|
||||||
|
@Autowired
|
||||||
|
private BuyOrderProductDao buyOrderProductDao;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@Lazy
|
@Lazy
|
||||||
@@ -145,6 +150,15 @@ public class WeChatPayController {
|
|||||||
userEbookBuyEntities.add(entity);
|
userEbookBuyEntities.add(entity);
|
||||||
}
|
}
|
||||||
userEbookBuyService.saveBatch(userEbookBuyEntities);
|
userEbookBuyService.saveBatch(userEbookBuyEntities);
|
||||||
|
//手摸脚模购买后会开启用户的脉穴的功能
|
||||||
|
List<Integer> collect = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().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");
|
buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "0");
|
||||||
}
|
}
|
||||||
if ("point".equals(order.getOrderType())) {
|
if ("point".equals(order.getOrderType())) {
|
||||||
|
|||||||
Reference in New Issue
Block a user