From 07057a9a0c8624ec1876670e69b0631b1213793f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 14 八月 2024 09:04:32 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 188 +++++++++--------------------------------------
1 files changed, 36 insertions(+), 152 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 b646cee..3830f2c 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,5 +1,6 @@
package com.ruoyi.order.service.impl;
+import com.alibaba.fastjson2.JSON;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradeRefundRequest;
@@ -30,6 +31,7 @@
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
@@ -62,6 +64,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
@@ -72,6 +75,7 @@
* @author mitao
* @since 2024-05-22
*/
+@Slf4j
@Service
public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService {
@@ -96,7 +100,13 @@
private PaylogMapper paylogMapper;
@Override
- public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
+ public R<Map<String, Object>> getPayInfo(Long uid, Integer type, String orderNO, String openId,
+ HttpServletRequest request) {
+ PaymentMethodEnum paymentMethodEnum =
+ type == 1 ? PaymentMethodEnum.ALIPAY : PaymentMethodEnum.WECHAT;
+ Member member = memberClient.getMembeOne(uid, SecurityConstants.INNER).getData();
+ openId = member.getMiniOpenid();
+ String zfbOpenid = member.getZfbOpenid();
Double price = 0.0;
String subject;
String body;
@@ -108,13 +118,14 @@
wrapper1.eq(OrderAuctionBond::getDelFlag,0);
OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
one1.setBoundStatus(BondStatusEnum.PAID);
- one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ one1.setPaymentMethod(paymentMethodEnum);
orderAuctionBondMapper.updateById(one1);
if (one1.getBond()==null||one1.getBond().compareTo(new BigDecimal(0))==0){
one1.setBoundStatus(BondStatusEnum.PAID);
Map<String, Object> returnMap = new HashMap<>();
+ // Type 1是否需要支付
returnMap.put("Type",1);
return R.ok(returnMap);
}
@@ -126,48 +137,13 @@
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
- page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ page1.setPaymentMethod(paymentMethodEnum);
page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
if (page1.getTotalAmount().compareTo(new BigDecimal(0))==0){
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("Type",1);
return R.ok(returnMap);
- }
-
-
- /* if(page1.getOrderNo().contains("SP")){
- GoodsSku goodsSku =new GoodsSku();
- goodsSku.setId(page1.getGoodsSkuId());
- goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
- }
-
- if(page1.getOrderNo().contains("MS")){
- GoodsSku goodsSku =new GoodsSku();
- goodsSku.setId(page1.getGoodsSkuId());
- goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
- }*/
-
-
- if(page1.getOrderNo().contains("TG")){
- GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
- GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
- /* if (goodsSeckiGoodsGroupPurchaseInfo!=null){
- goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
- page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
- }else{
- UUID uuid = UUID.randomUUID();
- GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
- goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
- goodsGroupPurchaseInfo.setCurrentNumber(1);
- goodsGroupPurchaseInfo.setMubre(uuid.toString());
- goodsGroupPurchaseInfo.setGroupPurchaseId(page1.getGoodsSkuId());
- goodsGroupPurchaseInfo.setGroupStatus(0);
- goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
- page1.setGroupNo(uuid.toString());
- }*/
}
OrderMapper.updateById(page1);
@@ -190,73 +166,6 @@
- /*if (orderNO.contains("BO")) {
- LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
- wrapper1.eq(OrderAuctionBond::getDelFlag,0);
- OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
- if (one1.getBond().compareTo(new BigDecimal(0))==0){
- one1.setBoundStatus(BondStatusEnum.PAID);
- Map<String, Object> returnMap = new HashMap<>();
- returnMap.put("Type",1);
- return R.ok(returnMap);
- }
-
-
- }else{
- LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(Order::getOrderNo,orderNO);
- wrapper1.eq(Order::getDelFlag,0);
- Order page1 = OrderMapper.selectOne(wrapper1);
- if (page1.getTotalAmount().compareTo(new BigDecimal(0))==0){
- page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
- page1.setPayTime(LocalDateTime.now());
- OrderMapper.updateById(page1);
- Map<String, Object> returnMap = new HashMap<>();
- returnMap.put("Type",1);
-
-
- page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
- page1.setPayTime(LocalDateTime.now());
- OrderMapper.updateById(page1);
-
- if(page1.getOrderNo().contains("SP")){
- GoodsSku goodsSku =new GoodsSku();
- goodsSku.setId(page1.getGoodsSkuId());
- goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
- }
-
- if(page1.getOrderNo().contains("MS")){
- GoodsSku goodsSku =new GoodsSku();
- goodsSku.setId(page1.getGoodsSkuId());
- goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
- }
-
-
- 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, SecurityConstants.INNER);
-
-
- return R.ok(returnMap);
- }
-
-
-
- }*/
-
if (orderNO.contains("BO")) {
LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
@@ -267,7 +176,7 @@
subject = " 订单支付";
if (type == 1) {
// 支付宝预下单
- return this.alipay(orderNO, subject, body, price, request);
+ return this.alipay(zfbOpenid, orderNO, subject, body, price, request);
} if (type == 2){
// 微信预下单
return this.wxpay(2 ,orderNO, body, openId, price, request);
@@ -283,7 +192,7 @@
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
- return this.alipay(orderNO, subject, body, price, request);
+ return this.alipay(zfbOpenid, orderNO, subject, body, price, request);
} if (type == 2) {
// 微信预下单
return this.wxpay(2, orderNO, body,openId, price, request);
@@ -292,7 +201,7 @@
}
} catch (Exception e) {
- e.printStackTrace();
+ log.info("获取异常", e);
}
return R.fail("获取异常");
}
@@ -306,6 +215,7 @@
*/
@Override
public void notifyUrl(HttpServletRequest request, HttpServletResponse res) {
+ log.info("=============================支付宝回调=============================");
HttpServletResponse response = (HttpServletResponse) res;
response.setContentType("text/html;charset=UTF-8");
PrintWriter out;
@@ -404,26 +314,9 @@
}
}
-
- if (page1.getPoints()!=0){
- 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, SecurityConstants.INNER);
}
}
-
-
// ——请根据您的业务逻辑来编写程序（以上代码仅作参考）——
log.debug("AlipayController.notifyUrl__回调处理：success");
@@ -435,7 +328,7 @@
log.debug("AlipayController.notifyUrl__回调逻辑代码处理异常！fail");
// 返回失败
out.println("fail");
- e.printStackTrace();
+ log.error("AlipayController.notifyUrl__回调逻辑代码处理异常！fail", e);
}
// ////////////////////////////////////////////////////////////////////////////////////////
} else {// 验证失败
@@ -445,7 +338,7 @@
} catch (
IOException e) {
log.debug("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！");
- e.printStackTrace();
+ log.error("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！", e);
}
}
@@ -578,20 +471,7 @@
}
}
- if (page1.getPoints()!=0){
- 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, SecurityConstants.INNER);
+
}
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
@@ -636,6 +516,7 @@
+ "\", " + "\"refund_amount\":" + refund_amount + ", " + "\"refund_reason\":\"正常退款\","
+ "\"out_request_no\":\"HZ01RF001\"" + "}");
AlipayTradeRefundResponse response = alipayClient.execute(request);
+ log.info("支付宝退款response:" + response.getBody());
// 调用成功，则处理业务逻辑
if (response.isSuccess()) {
return true;
@@ -656,20 +537,24 @@
* @param request
* @return
*/
- public R<Map<String, Object>> alipay(String orderNo, String subject, String body, Double price,
+ public R<Map<String, Object>> alipay(String zfbOpenid, String orderNo, String subject,
+ String body, Double price,
HttpServletRequest request) {
try {
// 接口封装支付宝请求参数
// Map<String, Object> mData = new HashMap<String, Object>();
// 构建请求支付签名参数
- Map<String, Object> pay = PayDemoActivity.appPay(subject, body, price, orderNo);
+ // Map<String, Object> pay = PayDemoActivity.appPay(subject, body, price, orderNo);
+ Map<String, Object> pay = PayDemoActivity.jsApiPay(subject, body, price, orderNo,
+ zfbOpenid);
/*
* Set<Entry<String, String>> entrySet = pay.entrySet();
* Iterator<Entry<String, String>> iterator = entrySet.iterator();
* while (iterator.hasNext()) { Entry<String, String> next =
* iterator.next(); mData.put(next.getKey(), next.getValue()); }
*/
+ log.info("支付宝预支付信息：{}", JSON.toJSONString(pay));
return R.ok(pay);
} catch (Exception e) {
e.printStackTrace();
@@ -855,10 +740,9 @@
System.out.println("证书: " + Configure.getCertLocalPath_2());
String xmlResult = WxPayApi.orderRefund(false, paraMap,Configure.getCertLocalPath_2(), Configure.getMchid());
-
+ System.out.println("微信退款结果: " + xmlResult);
return true;
}
-
/**
* 获取支付宝
*
@@ -867,7 +751,7 @@
* @throws Exception
*/
private Paylog getPayLog_alipay(HttpServletRequest request) throws IOException {
- //////// 获取支付宝的通知返回参数，可参考技术文档中页面跳转同步通知参数列表(以下仅供参考)////////
+ //////// 获取支付宝的通知返回参数，可参考技术文档中页面跳转步通知同参数列表(以下仅供参考)////////
// 商户订单号
String out_trade_no = new String(request.getParameter("out_trade_no").getBytes("ISO-8859-1"), "UTF-8");
// 支付宝交易号
@@ -875,12 +759,12 @@
// 交易状态
String trade_status = new String(request.getParameter("trade_status").getBytes("ISO-8859-1"), "UTF-8");
// 支付者唯一Id
- String buyer_id = new String(request.getParameter("buyer_id").getBytes("ISO-8859-1"), "UTF-8");
+ // String buyer_id = new String(request.getParameter("buyer_id").getBytes("ISO-8859-1"), "UTF-8");
// 支付帐号
- String buyer_email = "";
- if (SinataUtil.isNotEmpty(request.getParameter("buyer_logon_id"))) {
- buyer_email = new String(request.getParameter("buyer_logon_id").getBytes("ISO-8859-1"), "UTF-8");
- }
+ // String buyer_email = "";
+ // if (SinataUtil.isNotEmpty(request.getParameter("buyer_logon_id"))) {
+ // buyer_email = new String(request.getParameter("buyer_logon_id").getBytes("ISO-8859-1"), "UTF-8");
+ // }
// 支付金额
String total_fee = new String(request.getParameter("total_amount").getBytes("ISO-8859-1"), "UTF-8");
// 支付时间
@@ -890,7 +774,7 @@
Paylog paylog = new Paylog();
paylog.setOutTradeNo(out_trade_no);
paylog.setPayType(1);
- paylog.setBuyerId(buyer_id);
+ // paylog.setBuyerId(buyer_id);
paylog.setTradeNo(trade_no);
paylog.setPayMoney(Double.parseDouble(total_fee));
paylog.setState(1);
--
Gitblit v1.7.1