From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 755 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 632 insertions(+), 123 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 24d6073..3b124c8 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,38 +1,66 @@
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.alibaba.fastjson2.JSON;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradeRefundRequest;
import com.alipay.api.response.AlipayTradeRefundResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jpay.ext.kit.PaymentKit;
+import com.jpay.weixin.api.WxPayApi;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
+import com.ruoyi.common.core.enums.BondStatusEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
+import com.ruoyi.common.core.enums.PaymentMethodEnum;
+import com.ruoyi.common.core.enums.PointStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.order.domain.pojo.Paylog;
+import com.ruoyi.order.domain.Paylog;
+import com.ruoyi.order.mapper.OrderAuctionBondMapper;
+import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.mapper.PaylogMapper;
import com.ruoyi.order.service.IPaylogService;
+import com.ruoyi.order.util.MD5AndKL;
+import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
import com.ruoyi.order.util.alipay.config.AlipayConfig;
import com.ruoyi.order.util.alipay.util.PayDemoActivity;
import com.ruoyi.order.util.tencent.common.Configure;
-import com.ruoyi.order.util.tencent.common.Signature;
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 com.ruoyi.system.api.domain.AuctionBondJl;
+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;
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.GoodsSkuClient;
+import com.ruoyi.system.api.feignClient.MemberClient;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.UUID;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -40,6 +68,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;
/**
@@ -50,36 +79,149 @@
* @author mitao
* @since 2024-05-22
*/
+@Slf4j
@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;
+
+ @Resource
+ private OrderAuctionBondMapper orderAuctionBondMapper;
+
+ @Resource
+ private GoodsSkuClient goodsSkuClient;
+
+ @Resource
+ private PaylogMapper paylogMapper;
@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(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;
+ if (judgeContainsStr(orderNO)) {
+ 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() == 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);
+ }
- try {
- if(judgeContainsStr(orderID)){
- price= Double.valueOf(1);
- body = "商品支付";
- subject = "商品支付";
+ } 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) {
+ Map<String, Object> returnMap = new HashMap<>();
+ returnMap.put("Type", 1);
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPaymentMethod(paymentMethodEnum);
+ 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);
+ }
+
+ return R.ok(returnMap);
+ }
+ 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);
+ }
+
+ if (orderNO.contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1 = Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo, orderNO);
+ wrapper1.eq(OrderAuctionBond::getDelFlag, 0);
+ OrderAuctionBond one = orderAuctionBondMapper.selectOne(wrapper1);
+ price = one.getBond().doubleValue();
+ body = " 订单支付";
+ subject = " 订单支付";
+ if (type == 1) {
+ // 支付宝预下单
+ return this.alipay(zfbOpenid, orderNO, subject, body, price, request);
+ }
+ if (type == 2) {
+ // 微信预下单
+ R<Map<String, Object>> wxpayR = this.wxpay(2, orderNO, body, openId, price,
+ request);
+ Map<String, Object> wxpay = wxpayR.getData();
+ if (wxpay.get(
+ "result_code").equals("FAIL") && wxpay.get("err_code_des")
+ .equals("201 商户订单号重复")) {
+ one.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
+ orderAuctionBondMapper.updateById(one);
+ wxpayR = this.wxpay(2, one.getOrderNo(), body, openId, price,
+ request);
+ }
+ return wxpayR;
+ }
+ } else {
+ LambdaQueryWrapper<Order> wrapper1 = Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo, orderNO);
+ wrapper1.eq(Order::getDelFlag, 0);
+ Order page1 = orderMapper.selectOne(wrapper1);
+ price = page1.getTotalAmount().doubleValue();
+ body = " 订单支付";
+ subject = " 订单支付";
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
- return paylogServiceImpl.alipay("1", subject, body, price, request);
- } else {
+ return this.alipay(zfbOpenid, orderNO, subject, body, price, request);
+ }
+ if (type == 2) {
// 微信预下单
- return paylogServiceImpl.wxpay(1, "1", body, price, request);
+ R<Map<String, Object>> wxpayR = this.wxpay(2, orderNO, body, openId, price,
+ request);
+ Map<String, Object> wxpay = wxpayR.getData();
+ if (wxpay.get("result_code").equals("FAIL") && wxpay.get("err_code_des")
+ .equals("201 商户订单号重复")) {
+ String prefix = page1.getOrderNo().substring(0, 2);
+ page1.setOrderNo(OrderUtil.getOrderNoForPrefix(prefix));
+ orderMapper.updateById(page1);
+ wxpayR = this.wxpay(2, page1.getOrderNo(), body, openId, price,
+ request);
+ }
+ return wxpayR;
}
}
- } catch (Exception e) {
- e.printStackTrace();
}
return R.fail("获取异常");
}
@@ -93,6 +235,7 @@
*/
@Override
public void notifyUrl(HttpServletRequest request, HttpServletResponse res) {
+ log.info("=============================支付宝回调=============================");
HttpServletResponse response = (HttpServletResponse) res;
response.setContentType("text/html;charset=UTF-8");
PrintWriter out;
@@ -114,19 +257,130 @@
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);
+ if (paylog1.getOutTradeNo().contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,paylog1.getOutTradeNo());
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+
+ if (one1.getBondType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS) &&
+ one1.getOrderTimeSx().isBefore(LocalDateTime.now())) {
+ boolean bo = refundForAlipay(paylog1.getOutTradeNo(), paylog1.getTradeNo(), paylog1.getPayMoney());
+ }
+
+ one1.setBoundStatus(BondStatusEnum.PAID);
+ orderAuctionBondMapper.updateById(one1);
+ AuctionOrderTypeEnum bondType = one1.getBondType();
+ AuctionBondJl auctionBondJl = null;
+ if (bondType.equals(AuctionOrderTypeEnum.AUCTION_ITEMS)) {
+ auctionBondJl = auctionClient.getAuctionBondJLByTargetId(
+ one1.getAuctionSalesroomId(), one1.getMemberId(),
+ bondType.getCode(), SecurityConstants.INNER)
+ .getData();
+ log.info("保证金支付回调，添加拍卖参与记录开始进行");
+ if (Objects.isNull(auctionBondJl)) {
+ auctionBondJl = new AuctionBondJl();
+ auctionBondJl.setAuctionSalesroomId(
+ one1.getAuctionSalesroomId());
+ auctionBondJl.setIsState(0);
+ auctionBondJl.setBondType(bondType.getCode());
+ auctionBondJl.setMemberId(
+ one1.getMemberId());
+ } else {
+ auctionBondJl.setIsState(0);
+ }
+ } else {
+ auctionBondJl = auctionClient.getAuctionBondJLByTargetId(
+ one1.getAuctionGoodsId(), one1.getMemberId(),
+ bondType.getCode(), SecurityConstants.INNER)
+ .getData();
+ if (Objects.isNull(auctionBondJl)) {
+ auctionBondJl = new AuctionBondJl();
+ auctionBondJl.setAuctionGoodsId(one1.getAuctionGoodsId());
+ auctionBondJl.setIsState(0);
+ auctionBondJl.setBondType(bondType.getCode());
+ auctionBondJl.setMemberId(
+ one1.getMemberId());
+ } else {
+ auctionBondJl.setIsState(0);
+ }
+ }
+ auctionClient.saveOrUpdateAuctionBondJl(auctionBondJl,
+ SecurityConstants.INNER);
+ log.info("保证金支付回调，添加拍卖参与记录结束");
+ }else{
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = orderMapper.selectOne(wrapper1);
+
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPaymentMethod(PaymentMethodEnum.ALIPAY);
+ 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);
+ }
+
+ if(page1.getOrderNo().contains("TG")){
+ log.info(
+ "===================================开始处理团购回调===================================");
+ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ log.info("==================已有待成团团购================");
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ orderMapper.updateById(page1);
+ Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity();
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }else{
+ log.info("==================开启一个新团================");
+ UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ orderMapper.updateById(page1);
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setPurchaseNum(page1.getGoodsQuantity());
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }
+ }
+
+ }
}
+
// ——请根据您的业务逻辑来编写程序（以上代码仅作参考）——
log.debug("AlipayController.notifyUrl__回调处理：success");
out.println("success"); // 请不要修改或删除
@@ -137,7 +391,7 @@
log.debug("AlipayController.notifyUrl__回调逻辑代码处理异常！fail");
// 返回失败
out.println("fail");
- e.printStackTrace();
+ log.error("AlipayController.notifyUrl__回调逻辑代码处理异常！fail", e);
}
// ////////////////////////////////////////////////////////////////////////////////////////
} else {// 验证失败
@@ -147,7 +401,7 @@
} catch (
IOException e) {
log.debug("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！");
- e.printStackTrace();
+ log.error("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！", e);
}
}
@@ -174,28 +428,31 @@
System.out.println("WxpayController.notify__notityXml：\n" + notityXml);
// 验证签名
- if (Signature.checkIsSignValidFromResponseString(1, notityXml.toString())
- || Signature.checkIsSignValidFromResponseString(2, notityXml.toString())) {
- Map<String, Object> map = XMLParser.getMapFromXML(notityXml.toString());
- // log.debug("WxpayController.notify__map：\n" + map);
- // 接口返回状态
- String result_code = (String) map.get("result_code");
- if ("SUCCESS".equals(result_code)) {
- // // 商户订单号
- String out_trade_no = (String) map.get("out_trade_no");
- // // 微信支付交易号
- String trade_no = (String) map.get("transaction_id");
- // // 金额,以分为单位
- String total_fee = (String) map.get("total_fee");
- // // 优惠金额
- // String discount = (String) map.get("discount");
- // // 支付完成时间
- String time_end = (String) map.get("time_end");
- // // 支付者唯一Id（对应买家账号的一个加密串 ）
- String buyer_id = (String) map.get("buyer_id");
+ Map<String, Object> map = XMLParser.getMapFromXML(notityXml.toString());
+ // log.debug("WxpayController.notify__map：\n" + map);
+ // 接口返回状态
+ String result_code = (String) map.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ // // 商户订单号
+ String out_trade_no = (String) map.get("out_trade_no");
+ // // 微信支付交易号
+ String trade_no = (String) map.get("transaction_id");
+ // // 金额,以分为单位
+ String total_fee = (String) map.get("total_fee");
+ // // 优惠金额
+ // String discount = (String) map.get("discount");
+ // // 支付完成时间
+ String time_end = (String) map.get("time_end");
+ // // 支付者唯一Id（对应买家账号的一个加密串 ）
+ String buyer_id = (String) map.get("buyer_id");
- ///////////////////////////// 这里程序处理支付回调逻辑
- ///////////////////////////// ////////////////////
+ ///////////////////////////// 这里程序处理支付回调逻辑
+ ///////////////////////////// ////////////////////
+
+ 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);
@@ -205,23 +462,133 @@
paylog.setState(1);
System.out.println("支付完成时间" + time_end);
paylog.setAddTime(LocalDateTime.now());
- iPaylogService.save(paylog);
- if (judgeContainsStr(paylog.getOutTradeNo())) {
+ this.save(paylog);
+ if (paylog.getOutTradeNo().contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+ if (one1.getBondType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS)
+ && one1.getOrderTimeSx().isBefore(LocalDateTime.now())) {
+ String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 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));
+ refundFee = Integer.parseInt(money.substring(0, money.length() - 3));
+ String regEx = "[^0-9]";
+ Pattern p = Pattern.compile(regEx);
+ Matcher m = p.matcher(paylog.getOutTradeNo());
+ String ma = m.replaceAll("").trim();
+ refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
+ }
- log.debug("WxpayController.notify__回调处理成功：SUCCESS");
- response.getOutputStream().print("success");
+ one1.setBoundStatus(BondStatusEnum.PAID);
+ one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ orderAuctionBondMapper.updateById(one1);
+ AuctionOrderTypeEnum bondType = one1.getBondType();
+ AuctionBondJl auctionBondJl = null;
+ if (bondType.equals(AuctionOrderTypeEnum.AUCTION_ITEMS)) {
+ auctionBondJl = auctionClient.getAuctionBondJLByTargetId(
+ one1.getAuctionSalesroomId(), one1.getMemberId(),
+ bondType.getCode(), SecurityConstants.INNER)
+ .getData();
+ log.info("保证金支付回调，添加拍卖参与记录开始进行");
+ if (Objects.isNull(auctionBondJl)) {
+ auctionBondJl = new AuctionBondJl();
+ auctionBondJl.setAuctionSalesroomId(
+ one1.getAuctionSalesroomId());
+ auctionBondJl.setIsState(0);
+ auctionBondJl.setBondType(bondType.getCode());
+ auctionBondJl.setMemberId(
+ one1.getMemberId());
+ } else {
+ auctionBondJl.setIsState(0);
+ }
+ } else {
+ auctionBondJl = auctionClient.getAuctionBondJLByTargetId(
+ one1.getAuctionGoodsId(), one1.getMemberId(),
+ bondType.getCode(), SecurityConstants.INNER)
+ .getData();
+ if (Objects.isNull(auctionBondJl)) {
+ auctionBondJl = new AuctionBondJl();
+ auctionBondJl.setAuctionGoodsId(one1.getAuctionGoodsId());
+ auctionBondJl.setIsState(0);
+ auctionBondJl.setBondType(bondType.getCode());
+ auctionBondJl.setMemberId(
+ one1.getMemberId());
+ } else {
+ auctionBondJl.setIsState(0);
+ }
+ }
+ auctionClient.saveOrUpdateAuctionBondJl(auctionBondJl,
+ SecurityConstants.INNER);
+ log.info("保证金支付回调，添加拍卖参与记录结束");
+ }else{
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = orderMapper.selectOne(wrapper1);
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ 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);
+ }
+ if(page1.getOrderNo().contains("TG")){
+ log.info(
+ "===================================开始处理团购回调===================================");
+ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ log.info("==================已有待成团团购================");
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ orderMapper.updateById(page1);
+ Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity();
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }else{
+ log.info("==================开启一个新团================");
+ UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ orderMapper.updateById(page1);
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setPurchaseNum(page1.getGoodsQuantity());
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }
+ }
+
}
+
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
response.getOutputStream().print("success");
- } else {
- log.debug("WxpayController.notify__回调处理：验证状态错误！" + result_code);
- System.out.println("验证状态错误！" + result_code);
}
+ log.debug("WxpayController.notify__回调处理成功：SUCCESS");
+ response.getOutputStream().print("success");
} else {
- log.debug("WxpayController.notify__回调处理：通知签名验证失败！");
- System.out.println("通知签名验证失败！");
+ log.debug("WxpayController.notify__回调处理：验证状态错误！" + result_code);
+ System.out.println("验证状态错误！" + result_code);
}
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -254,6 +621,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;
@@ -274,20 +642,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();
@@ -306,45 +678,133 @@
* @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> map1 = 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);
// 获取预支付接口返回参数
- map = XMLParser.getMapFromXML(result);
+ map1 = XMLParser.getMapFromXML(result);
System.out.println("WxpayController.createOrder__result：\n" + result);
// 捕获预支付接口错误提示
- if ("FAIL".equals(map.get("result_code")) || "FAIL".equals(map.get("return_code"))) {
- return R.fail(String.valueOf(map.get("return_msg")));
- }
+ if ("FAIL".equals(map1.get("result_code")) || "FAIL".equals(map1.get("return_code"))) {
+ return R.fail(String.valueOf(map1.get("return_msg")));
+ }*/
- // 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
+ /* // 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
AppPayReqData appPay = new AppPayReqData(apptype, (String) map.get("appid"), (String) map.get("mch_id"),
- (String) map.get("prepay_id"), unifiedorderReqData.getNonce_str());
+ (String) map.get("prepay_id"), unifiedorderReqData.getNonce_str());*/
+ UUID uuid = UUID.randomUUID();
+ String nonceStr = uuid.toString().replaceAll("-", "");
+ //商品描述 String body = "XX商城-支付订单";
+ // 创建hashmap(用户获得签名)
+ SortedMap<String, String> paraMap = new TreeMap<>();
+ //设置请求参数(小程序ID)
+ paraMap.put("appid", Configure.getAppid());
+ //设置请求参数(商户号)
+ paraMap.put("mch_id", Configure.getMchid());
+ //设置请求参数(随机字符串)
+ paraMap.put("nonce_str", nonceStr);
+ //设置请求参数(商品描述)
+ paraMap.put("body", body);
+ //设置请求参数(商户订单号)
+ paraMap.put("out_trade_no", outTradeNo);
+ //设置请求参数(总金额)
+
+ String money=SinataUtil.doubleRetainTwo(price*100d);
+ Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
+ log.info(
+ "============================>WxpayController.createOrder__price1：\n" + price1);
+ paraMap.put("total_fee", price1.toString());
+ //设置请求参数(通知地址)
+ paraMap.put("notify_url", Configure.wx_notify_url);
+ //设置请求参数(交易类型)
+ paraMap.put("trade_type", String.valueOf(WxPayApi.TradeType.JSAPI));
+
+ paraMap.put("openid",openId);
+
+ //设置请求参数(openid)(在接口文档中 该参数 是否必填项 但是一定要注意 如果交易类型设置成'JSAPI'则必须传入openid)
+ //MD5运算生成签名，这里是第一次签名，用于调用统一下单接口
+ String sign = PaymentKit.createSign(paraMap, "HSCEWrfSYiwxR6sesZ6De91Xh3m447sh");
+ paraMap.put("sign", sign);
+ //统一下单,向微信api发送数据
+ log.info(
+ "============================>WxpayController.paraMap：\n" + paraMap);
+ //转成xml
+ String xmlResult = WxPayApi.pushOrder(false, paraMap);
+ Map<String, String> map = PaymentKit.xmlToMap(xmlResult);
+ log.info(
+ "============================>WxpayController.map：\n" + map);
+ //返回状态码
+ String returnCode = map.get("return_code");
+ /* Assert.isTrue("SUCCESS".equals(returnCode), getMsgByCode(returnCode));*/
+
+ //返回给小程序端需要的参数
+ Map<String, Object> returnMap = new HashMap<>(20);
+ String prepay_id = map.get("prepay_id");
+ //重新进行签名后返回给前端
+ returnMap.put("appId", map.get("appid"));
+ returnMap.put("nonceStr", map.get("nonce_str"));
+ returnMap.put("package", "prepay_id=" + prepay_id);
+ returnMap.put("timeStamp", new Date().getTime() + "");
+ returnMap.put("signType", "MD5");
+ String signature = weixinSignature(returnMap, "HSCEWrfSYiwxR6sesZ6De91Xh3m447sh");
+
+ returnMap.put("prepay_id", prepay_id);
+ returnMap.put("mch_id", map.get("mch_id"));
+ returnMap.put("trade_type", map.get("trade_type"));
+
+ returnMap.put("sign", signature);
+ returnMap.put("Type",2);
+ returnMap.put("result_code", map.get("result_code"));
+ returnMap.put("err_code_des", map.get("err_code_des"));
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
- 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());// 商户号
- appPayMap.put("prepayId", appPay.getPrepayid());// 预支付编号（微信返回的支付交易会话ID）
- appPayMap.put("timeStamp", appPay.getTimestamp());// 时间戳
- appPayMap.put("sign", appPay.getSign());// 根据API给的签名规则进行签名
- return R.ok(appPayMap);
+ return R.ok(returnMap);
} catch (Exception e) {
System.out.println("统一下单_API_处理异常！");
e.printStackTrace();
}
return R.fail("统一下单失败");
+ }
+
+ private static String weixinSignature(Map<String, Object> map, String privateKey) {
+ try {
+ Set<Map.Entry<String, Object>> entries = map.entrySet();
+ List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+ // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+ Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+ @Override
+ public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+ return (o1.getKey()).toString().compareTo(o2.getKey());
+ }
+ });
+ // 构造签名键值对的格式
+ StringBuilder sb = new StringBuilder();
+ for (Map.Entry<String, Object> item : infoIds) {
+ if (item.getKey() != null || item.getKey() != "") {
+ String key = item.getKey();
+ Object val = item.getValue();
+ if (!(val == "" || val == null)) {
+ sb.append(key + "=" + val + "&");
+ }
+ }
+ }
+ sb.append("key=" + privateKey);
+ String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+ return sign;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
@@ -367,29 +827,34 @@
*/
public static boolean refundForWxpay(Integer apptype, String transactionID, String outTradeNo, String outRefundNo,
Integer totalFee, Integer refundFee, String pay_type) {
- Map<String, Object> map = new HashMap<String, Object>();
- try {
- // 构建接口请求参数
- com.tencent.protocol.RefundReqData refundReqData = new com.tencent.protocol.RefundReqData(transactionID, outTradeNo, outRefundNo, totalFee, refundFee,
- pay_type);
- // 请求接口返回结果
- String result = requestRefundService(apptype, refundReqData);
- System.out.println("微信退款返回内容：" + result);
- // 获取预支付接口返回参数
- map = XMLParser.getMapFromXML(result);
- System.out.println("微信退款返回参数：" + map);
- // 退款成功处理
- if ("SUCCESS".equals(map.get("result_code"))) {
- return true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- return false;
+ //生成32位随机数
+ UUID uuid = UUID.randomUUID();
+ String nonceStr = uuid.toString().replaceAll("-", "");
+ //商品描述 String body = "XX商城-支付订单";
+ // 创建hashmap(用户获得签名)
+ SortedMap<String, String> paraMap = new TreeMap<>();
+ //设置请求参数(小程序ID)
+ paraMap.put("appid", Configure.getAppid());
+ //设置请求参数(商户号)
+ paraMap.put("mch_id", Configure.getMchid());
+ //设置请求参数(随机字符串)
+ paraMap.put("nonce_str", nonceStr);
+ paraMap.put("transaction_id",transactionID);
+ paraMap.put("out_trade_no", outTradeNo);
+ paraMap.put("out_refund_no", outRefundNo);
+ //设置请求参数(支付的总金额)
+ paraMap.put("total_fee", totalFee.toString());
+ //设置请求参数(退款的金额)
+ paraMap.put("refund_fee", refundFee.toString());
+ //MD5运算生成签名
+ paraMap.put("sign", PaymentKit.createSign(paraMap, "HSCEWrfSYiwxR6sesZ6De91Xh3m447sh"));
+ System.out.println("证书: " + Configure.getCertLocalPath_2());
+
+ String xmlResult = WxPayApi.orderRefund(false, paraMap,Configure.getCertLocalPath_2(), Configure.getMchid());
+ System.out.println("微信退款结果: " + xmlResult);
+ return true;
}
-
/**
* 获取支付宝
*
@@ -398,7 +863,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");
// 支付宝交易号
@@ -406,12 +871,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");
// 支付时间
@@ -421,29 +886,33 @@
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);
paylog.setAddTime(LocalDateTime.now());
paylog.setTradeStatus(trade_status.toString());
- iPaylogService.save(paylog);
return paylog;
}
- public boolean judgeContainsStr(String cardNum) {
- String regex=".*[a-zA-Z]+.*";
- Matcher m= Pattern.compile(regex).matcher(cardNum);
- return m.matches();
- }
+ public boolean judgeContainsStr(String cardNum) {
+ String regex=".*[a-zA-Z]+.*";
+ Matcher m= Pattern.compile(regex).matcher(cardNum);
+ return m.matches();
+ }
+ /**
+ * @param refundDTOS 退款数据传输对象
+ * @return Map<String, Object> key ：orderNo value 退款结果
+ */
@Override
public Map<String, Object> refund(List<RefundDTO> refundDTOS) {
+ log.info("开始退款，入参：{}", 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 = iPaylogService.lambdaQuery()
+ if (StringUtils.isNotEmpty(refundDTOS)) {
+ Set<String> orderNoList = refundDTOS.stream().map(RefundDTO::getOrderNo)
+ .collect(Collectors.toSet());
+ 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<>();
@@ -460,17 +929,57 @@
}
});
}
- iPaylogService.updateBatchById(updList);
+ this.updateBatchById(updList);
}
return map;
}
+ @Override
+ public void refund1(RefundDTO refundDTOS) {
+
+ LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
+ paylogEntityWrapper.eq(Paylog::getOutTradeNo, refundDTOS.getOrderNo());
+ Paylog paylog = paylogMapper.selectOne(paylogEntityWrapper);
+
+
+ if (paylog.getPayType() ==1) {//支付宝
+ //获取支付信息
+
+ if (paylog != null) {
+ boolean bo = this.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
+ if (!bo) {
+ System.out.println("支付宝退款失败");
+ }
+ }
+
+ } else if (paylog.getPayType() ==2) {//微信
+ //获取支付信息
+ if (paylog != null) {
+ String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 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));
+ refundFee = Integer.parseInt(money.substring(0, money.length() - 3));
+
+ String regEx = "[^0-9]";
+ Pattern p = Pattern.compile(regEx);
+ Matcher m = p.matcher(refundDTOS.getOrderNo());
+ String ma = m.replaceAll("").trim();
+ boolean bo = this.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
+ if (!bo) {
+ System.out.println("微信退款失败");
+ }
+
+ }
+ }
+ }
+
private Boolean handleRefund(Paylog paylog, BigDecimal amount,
- String orderNo) {
+ String orderNo) {
boolean res = false;
if (StringUtils.isNotNull(paylog)) {
if (paylog.getPayType() == 1) {
- res = paylogServiceImpl.refundForAlipay(paylog.getOutTradeNo(),
+ res = refundForAlipay(paylog.getOutTradeNo(),
paylog.getTradeNo(), amount.doubleValue());
}
if (paylog.getPayType() == 2) {
@@ -481,9 +990,9 @@
String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
Integer totalFee = Integer.parseInt(
money.substring(0, money.length() - 3));
- res = paylogServiceImpl.refundForWxpay(2, paylog.getTradeNo(),
+ res = refundForWxpay(1, paylog.getTradeNo(),
paylog.getOutTradeNo(), orderNo, totalFee,
- refundFee, "4");
+ refundFee, "2");
}
}
return res;
--
Gitblit v1.7.1