From 0b9f2eeb5e2ff7995f39d217e90a6c64e37366d4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 六月 2024 15:32:44 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 186 insertions(+), 51 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index a76532a..58f439f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -1,14 +1,26 @@
package com.ruoyi.order.service.impl;
+import static com.ruoyi.order.util.tencent.WXPay.requestRefundService;
+import static com.ruoyi.order.util.tencent.WXPay.requestUnifiedorderService;
+
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradeRefundRequest;
import com.alipay.api.response.AlipayTradeRefundResponse;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.domain.pojo.Paylog;
-import com.ruoyi.order.mapper.PaylogMapper;
-import com.ruoyi.order.service.IPaylogService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
+import com.ruoyi.common.core.enums.PointStatusEnum;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.order.domain.Paylog;
+import com.ruoyi.order.mapper.OrderMapper;
+import com.ruoyi.order.mapper.PaylogMapper;
+import com.ruoyi.order.service.IOrderService;
+import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.order.util.alipay.config.AlipayConfig;
import com.ruoyi.order.util.alipay.util.PayDemoActivity;
@@ -17,24 +29,33 @@
import com.ruoyi.order.util.tencent.common.XMLParser;
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
+import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.dto.BondDTO;
+import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
+import com.ruoyi.system.api.domain.dto.RefundDTO;
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
+import com.ruoyi.system.api.feignClient.AuctionClient;
+import com.ruoyi.system.api.feignClient.MemberClient;
+import com.ruoyi.system.api.feignClient.OrderClient;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.ruoyi.order.util.tencent.WXPay.requestRefundService;
-import static com.ruoyi.order.util.tencent.WXPay.requestUnifiedorderService;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -47,29 +68,33 @@
@Service
public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService {
- @Resource
- private PaylogServiceImpl paylogServiceImpl;
+
@Resource
- private IPaylogService iPaylogService;
+ private OrderMapper OrderMapper;
+ @Resource
+ private AuctionClient auctionClient;
+
+ @Resource
+ private MemberClient memberClient;
@Override
- public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,
- HttpServletRequest request) {
+ public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
Double price = 0.0;
-
+ String subject;
+ String body;
try {
- if(judgeContainsStr(orderID)){
+ if(judgeContainsStr(orderNO)){
price= Double.valueOf(1);
- body = "商品支付";
- subject = "商品支付";
+ body = " 订单支付";
+ subject = " 订单支付";
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
- return paylogServiceImpl.alipay("1", subject, body, price, request);
+ return this.alipay(orderNO, subject, body, price, request);
} else {
// 微信预下单
- return paylogServiceImpl.wxpay(1, "1", body, price, request);
+ return this.wxpay(2, orderNO, body,openId, price, request);
}
}
} catch (Exception e) {
@@ -108,19 +133,50 @@
params.put(name, valueStr);
}
- Paylog paylog = getPayLog_alipay(request);
+ Paylog paylog1= getPayLog_alipay(request);
// 验证成功
- if ("TRADE_FINISHED".equals(paylog.getTradeStatus())) {
+ if ("TRADE_FINISHED".equals(paylog1.getTradeStatus())) {
System.out.println("AlipayController.notifyUrl__验证成功：success");
// 支付失败
- } else if ("TRADE_SUCCESS".equals(paylog.getTradeStatus())) {
+ } else if ("TRADE_SUCCESS".equals(paylog1.getTradeStatus())) {
// 支付成功
try {
- if(judgeContainsStr(paylog.getOutTradeNo())){
+ LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Paylog::getOutTradeNo,paylog1.getOutTradeNo());
+ Paylog one = this.getOne(wrapper);
+ if(SinataUtil.isEmpty(one)) {
+ this.save(paylog1);
+ BondDTO bondVO=new BondDTO();
+ bondVO.setOrderNO(paylog1.getOutTradeNo());
+ auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = OrderMapper.selectOne(wrapper1);
+ page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPoints(page1.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
}
+
+
+
// ——请根据您的业务逻辑来编写程序（以上代码仅作参考）——
log.debug("AlipayController.notifyUrl__回调处理：success");
out.println("success"); // 请不要修改或删除
@@ -190,18 +246,47 @@
///////////////////////////// 这里程序处理支付回调逻辑
///////////////////////////// ////////////////////
- Paylog paylog = new Paylog();
- paylog.setOutTradeNo(out_trade_no);
- paylog.setPayType(2);
- paylog.setBuyerId(buyer_id);
- paylog.setTradeNo(trade_no);
- paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
- paylog.setState(1);
- System.out.println("支付完成时间" + time_end);
- paylog.setAddTime(LocalDateTime.now());
- iPaylogService.save(paylog);
- if (judgeContainsStr(paylog.getOutTradeNo())) {
+ LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
+ Paylog one = this.getOne(wrapper);
+ if(SinataUtil.isEmpty(one)) {
+ Paylog paylog = new Paylog();
+ paylog.setOutTradeNo(out_trade_no);
+ paylog.setPayType(2);
+ paylog.setBuyerId(buyer_id);
+ paylog.setTradeNo(trade_no);
+ paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
+ paylog.setState(1);
+ System.out.println("支付完成时间" + time_end);
+ paylog.setAddTime(LocalDateTime.now());
+ this.save(paylog);
+ BondDTO bondVO=new BondDTO();
+
+ bondVO.setOrderNO(paylog.getOutTradeNo());
+ auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = OrderMapper.selectOne(wrapper1);
+ page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
+
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPoints(page1.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
+
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
response.getOutputStream().print("success");
@@ -300,17 +385,17 @@
* @param request
* @return
*/
- public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body, Double price,
+ public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body,String openId, Double price,
HttpServletRequest request) {
// 获取预支付接口返回参数
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> appPayMap = new HashMap<String, Object>();
try {
// 构建接口请求参数
- UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(apptype, outTradeNo, body, price,
- Configure.wx_notify_url);
+ UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(outTradeNo, body, price, Configure.wx_notify_url,
+ "JSAPI", openId);
// 请求接口获取返回接口
- String result = requestUnifiedorderService(apptype, unifiedorderReqData);
+ String result = requestUnifiedorderService(2, unifiedorderReqData);
System.out.println(result);
System.out.println("WxpayController.createOrder__result：\n" + result);
// 获取预支付接口返回参数
@@ -326,7 +411,7 @@
(String) map.get("prepay_id"), unifiedorderReqData.getNonce_str());
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
- appPayMap.put("appid", appPay.getAppid());// 公众账号ID
+ appPayMap.put("appid", appPay.getAppid());// 小程序ID
appPayMap.put("nonceStr", appPay.getNoncestr());// 随机字符串(32位)
appPayMap.put("package", appPay.get_package());// 扩展字段(暂填写固定值Sign=WXPay)
appPayMap.put("partnerId", appPay.getPartnerid());// 商户号
@@ -421,7 +506,6 @@
paylog.setState(1);
paylog.setAddTime(LocalDateTime.now());
paylog.setTradeStatus(trade_status.toString());
- iPaylogService.save(paylog);
return paylog;
}
@@ -431,4 +515,55 @@
return m.matches();
}
+ @Override
+ public Map<String, Object> refund(List<RefundDTO> refundDTOS) {
+ Map<String, Object> map = new HashMap<>();
+ Set<String> orderNoList = refundDTOS.stream().map(RefundDTO::getOrderNo)
+ .collect(Collectors.toSet());
+ if (StringUtils.isNotEmpty(orderNoList)) {
+ Map<String, Paylog> paylogMap = this.lambdaQuery()
+ .in(Paylog::getOutTradeNo, orderNoList).eq(Paylog::getState, 1).list().stream()
+ .collect(Collectors.toMap(Paylog::getOutTradeNo, Function.identity()));
+ List<Paylog> updList = new ArrayList<>();
+ for (RefundDTO refundDTO : refundDTOS) {
+ String orderNo = refundDTO.getOrderNo();
+ BigDecimal amount = refundDTO.getAmount();
+ Paylog paylog = paylogMap.get(orderNo);
+ Optional.of(paylog).ifPresent(pay -> {
+ Boolean res = handleRefund(pay, amount, orderNo);
+ map.put(orderNo, res);
+ if (res) {
+ pay.setState(3);
+ updList.add(pay);
+ }
+ });
+ }
+ this.updateBatchById(updList);
+ }
+ return map;
+ }
+
+ private Boolean handleRefund(Paylog paylog, BigDecimal amount,
+ String orderNo) {
+ boolean res = false;
+ if (StringUtils.isNotNull(paylog)) {
+ if (paylog.getPayType() == 1) {
+ res = this.refundForAlipay(paylog.getOutTradeNo(),
+ paylog.getTradeNo(), amount.doubleValue());
+ }
+ if (paylog.getPayType() == 2) {
+ String refundMoney = SinataUtil.doubleRetainTwo(
+ amount.doubleValue() * 100d);
+ Integer refundFee = Integer.parseInt(
+ refundMoney.substring(0, refundMoney.length() - 3));
+ String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer totalFee = Integer.parseInt(
+ money.substring(0, money.length() - 3));
+ res = this.refundForWxpay(2, paylog.getTradeNo(),
+ paylog.getOutTradeNo(), orderNo, totalFee,
+ refundFee, "4");
+ }
+ }
+ return res;
+ }
}
--
Gitblit v1.7.1