From 0af4429cca70d12e8e84cb2773b76ed1a72128c4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 二月 2025 14:53:59 +0800
Subject: [PATCH] 管理后台：会员管理-增加会员分类
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 351 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 236 insertions(+), 115 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 76dbfc5..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,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;
@@ -11,6 +12,7 @@
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;
@@ -22,11 +24,13 @@
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.XMLParser;
+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;
@@ -51,6 +55,7 @@
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;
@@ -63,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;
/**
@@ -73,13 +79,14 @@
* @author mitao
* @since 2024-05-22
*/
+@Slf4j
@Service
public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService {
@Resource
- private OrderMapper OrderMapper;
+ private OrderMapper orderMapper;
@Resource
private AuctionClient auctionClient;
@@ -99,102 +106,122 @@
@Override
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;
- try {
- 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 (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);
- one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
- orderAuctionBondMapper.updateById(one1);
+ Map<String, Object> returnMap = new HashMap<>();
+ // Type 1是否需要支付
+ returnMap.put("Type", 1);
+ return R.ok(returnMap);
+ }
-
- if (one1.getBond()==null||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);
+ } 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.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);
- }
- OrderMapper.updateById(page1);
-
- 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);
+ 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);
}
- 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 (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);
}
-
-
- 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(orderNO, subject, body, price, request);
- } if (type == 2){
- // 微信预下单
- return this.wxpay(2 ,orderNO, body, openId, price, request);
- }
- }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 this.alipay(orderNO, subject, body, price, request);
- } if (type == 2) {
- // 微信预下单
- return this.wxpay(2, orderNO, body,openId, price, request);
- }
- }
-
+ updMembeOneDTO MembeOneDTO = new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);
}
- } catch (Exception e) {
- e.printStackTrace();
+
+ 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 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 商户订单号重复")) {
+ 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;
+ }
+ }
}
return R.fail("获取异常");
}
@@ -208,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;
@@ -250,23 +278,61 @@
wrapper1.eq(OrderAuctionBond::getDelFlag,0);
OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
- if (one1.getOrderTimeSx().isAfter(LocalDateTime.now())){
+ 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);
+ 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());
@@ -282,19 +348,23 @@
}
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);
+ 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);
+ orderMapper.updateById(page1);
GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
goodsGroupPurchaseInfo.setCurrentNumber(1);
@@ -306,6 +376,7 @@
}
}
+
}
}
@@ -320,7 +391,7 @@
log.debug("AlipayController.notifyUrl__回调逻辑代码处理异常！fail");
// 返回失败
out.println("fail");
- e.printStackTrace();
+ log.error("AlipayController.notifyUrl__回调逻辑代码处理异常！fail", e);
}
// ////////////////////////////////////////////////////////////////////////////////////////
} else {// 验证失败
@@ -330,7 +401,7 @@
} catch (
IOException e) {
log.debug("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！");
- e.printStackTrace();
+ log.error("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！", e);
}
}
@@ -397,7 +468,8 @@
wrapper1.eq(OrderAuctionBond::getOrderNo,paylog.getOutTradeNo());
wrapper1.eq(OrderAuctionBond::getDelFlag,0);
OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
- if (one1.getOrderTimeSx().isAfter(LocalDateTime.now())){
+ 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);
@@ -414,16 +486,53 @@
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);
+ 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();
@@ -439,19 +548,23 @@
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);
+ 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);
+ orderMapper.updateById(page1);
GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
goodsGroupPurchaseInfo.setCurrentNumber(1);
@@ -508,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;
@@ -528,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();
@@ -604,6 +722,8 @@
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);
@@ -617,9 +737,13 @@
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));*/
@@ -641,6 +765,7 @@
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"));
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
return R.ok(returnMap);
@@ -730,11 +855,6 @@
System.out.println("微信退款结果: " + xmlResult);
return true;
}
-
- public static void main(String[] args) {
- refundForWxpay(4, "4200002335202408022336923702",
- "BO24080216090001", "R123456789", 1, 1, "2");
- }
/**
* 获取支付宝
*
@@ -743,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");
// 支付宝交易号
@@ -751,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");
// 支付时间
@@ -766,7 +886,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);
@@ -787,10 +907,11 @@
*/
@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)) {
+ 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()));
--
Gitblit v1.7.1