From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 561 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 456 insertions(+), 105 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 e6be77b..487f7b5 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,8 +1,5 @@
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;
@@ -14,10 +11,13 @@
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.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.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;
@@ -26,23 +26,35 @@
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.GoodsGroupPurchase;
+import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
+import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Order;
-import com.ruoyi.system.api.domain.dto.BondDTO;
+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.*;
+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.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;
@@ -51,7 +63,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
/**
* <p>
@@ -71,8 +82,18 @@
@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 orderNO,String openId, HttpServletRequest request) {
@@ -81,21 +102,194 @@
String body;
try {
if(judgeContainsStr(orderNO)){
- 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);
- } else {
- // 微信预下单
- return this.wxpay(2, orderNO, body,openId, price, request);
+ if (orderNO.contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+ one1.setBoundStatus(BondStatusEnum.PAID);
+ one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ orderAuctionBondMapper.updateById(one1);
+
+
+ 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);
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ 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);
+
+ 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 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);
+ 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);
+ }
+ }
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -147,31 +341,82 @@
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);
+ 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.getOrderTimeSx().isAfter(LocalDateTime.now())){
+ boolean bo = refundForAlipay(paylog1.getOutTradeNo(), paylog1.getTradeNo(), paylog1.getPayMoney());
+ }
+
+
+ one1.setBoundStatus(BondStatusEnum.PAID);
+ orderAuctionBondMapper.updateById(one1);
+
+
+ }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.GOODS_TO_BE_RECEIVED);
+
+ 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);
+ }
- 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);
+ 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){
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ OrderMapper.updateById(page1);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }else{
+ UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ OrderMapper.updateById(page1);
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }
+ }
+
+ 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);
+ }
}
@@ -224,8 +469,6 @@
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);
// 接口返回状态
@@ -261,32 +504,89 @@
System.out.println("支付完成时间" + time_end);
paylog.setAddTime(LocalDateTime.now());
this.save(paylog);
- BondDTO bondVO=new BondDTO();
+ 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.getOrderTimeSx().isAfter(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));
- bondVO.setOrderNO(paylog.getOutTradeNo());
- auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+ 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");
+ }
- 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);
+ one1.setBoundStatus(BondStatusEnum.PAID);
+ one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ orderAuctionBondMapper.updateById(one1);
- MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
- memberPointsDTO.setMemberId(page1.getMemberId());
- memberPointsDTO.setPointsType(1);
- memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
- memberPointsDTO.setPoints(page1.getPoints());
- memberClient.addMemberPoints(memberPointsDTO);
+ }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());
- updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
- MembeOneDTO.setType(1);
- MembeOneDTO.setMemberId(page1.getMemberId());
- MembeOneDTO.setMoney(page1.getTotalAmount());
- MembeOneDTO.setTotalPoints(page1.getPoints());
- memberClient.updMembeOne(MembeOneDTO);
+
+ 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){
+ OrderMapper.updateById(page1);
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }else{
+ UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ OrderMapper.updateById(page1);
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }
+ }
+ 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");
response.getOutputStream().print("success");
@@ -297,10 +597,7 @@
log.debug("WxpayController.notify__回调处理：验证状态错误！" + result_code);
System.out.println("验证状态错误！" + result_code);
}
- } else {
- log.debug("WxpayController.notify__回调处理：通知签名验证失败！");
- System.out.println("通知签名验证失败！");
- }
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -385,13 +682,13 @@
* @param request
* @return
*/
- public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body,String openId, Double price,
+ public static R<Map<String, Object>> wxpay(Integer apptype,String outTradeNo, String body,String openId, Double price,
HttpServletRequest request) {
// 获取预支付接口返回参数
Map<String, Object> map1 = new HashMap<String, Object>();
Map<String, Object> appPayMap = new HashMap<String, Object>();
try {
- // 构建接口请求参数
+ /* // 构建接口请求参数
UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(outTradeNo, body, price, Configure.wx_notify_url,
"JSAPI", openId);
// 请求接口获取返回接口
@@ -404,7 +701,7 @@
// 捕获预支付接口错误提示
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"),
@@ -416,27 +713,30 @@
// 创建hashmap(用户获得签名)
SortedMap<String, String> paraMap = new TreeMap<>();
//设置请求参数(小程序ID)
- paraMap.put("appid", unifiedorderReqData.getAppid());
+ paraMap.put("appid", Configure.getAppid());
//设置请求参数(商户号)
- paraMap.put("mch_id", unifiedorderReqData.getMch_id());
+ paraMap.put("mch_id", Configure.getMchid());
//设置请求参数(随机字符串)
paraMap.put("nonce_str", nonceStr);
//设置请求参数(商品描述)
- paraMap.put("body", unifiedorderReqData.getBody());
+ paraMap.put("body", body);
//设置请求参数(商户订单号)
- paraMap.put("out_trade_no", unifiedorderReqData.getOut_trade_no());
+ paraMap.put("out_trade_no", outTradeNo);
//设置请求参数(总金额)
- paraMap.put("total_fee", unifiedorderReqData.getTotal_fee().toString());
+
+ String money=SinataUtil.doubleRetainTwo(price*100d);
+ Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
+ paraMap.put("total_fee", price1.toString());
//设置请求参数(通知地址)
- paraMap.put("notify_url", unifiedorderReqData.getNotify_url());
+ paraMap.put("notify_url", Configure.wx_notify_url);
//设置请求参数(交易类型)
paraMap.put("trade_type", String.valueOf(WxPayApi.TradeType.JSAPI));
- paraMap.put("openid", unifiedorderReqData.getOpenid());
+ paraMap.put("openid",openId);
//设置请求参数(openid)(在接口文档中 该参数 是否必填项 但是一定要注意 如果交易类型设置成'JSAPI'则必须传入openid)
//MD5运算生成签名，这里是第一次签名，用于调用统一下单接口
- String sign = PaymentKit.createSign(paraMap, "E10ADC3949BA59ABBE56E057F20F883E");
+ String sign = PaymentKit.createSign(paraMap, "HSCEWrfSYiwxR6sesZ6De91Xh3m447sh");
paraMap.put("sign", sign);
//统一下单,向微信api发送数据
//转成xml
@@ -448,7 +748,6 @@
//返回给小程序端需要的参数
Map<String, Object> returnMap = new HashMap<>(20);
-
String prepay_id = map.get("prepay_id");
//重新进行签名后返回给前端
returnMap.put("appId", map.get("appid"));
@@ -456,13 +755,14 @@
returnMap.put("package", "prepay_id=" + prepay_id);
returnMap.put("timeStamp", new Date().getTime() + "");
returnMap.put("signType", "MD5");
- String signature = weixinSignature(returnMap, "E10ADC3949BA59ABBE56E057F20F883E");
+ 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("err_code_des", map.get("err_code_des"));
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
return R.ok(returnMap);
@@ -479,6 +779,7 @@
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());
}
@@ -523,27 +824,33 @@
*/
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());
+
+ return true;
}
/**
@@ -592,6 +899,10 @@
return m.matches();
}
+ /**
+ * @param refundDTOS 退款数据传输对象
+ * @return Map<String, Object> key ：orderNo value 退款结果
+ */
@Override
public Map<String, Object> refund(List<RefundDTO> refundDTOS) {
Map<String, Object> map = new HashMap<>();
@@ -620,12 +931,52 @@
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) {
boolean res = false;
if (StringUtils.isNotNull(paylog)) {
if (paylog.getPayType() == 1) {
- res = this.refundForAlipay(paylog.getOutTradeNo(),
+ res = refundForAlipay(paylog.getOutTradeNo(),
paylog.getTradeNo(), amount.doubleValue());
}
if (paylog.getPayType() == 2) {
@@ -636,9 +987,9 @@
String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
Integer totalFee = Integer.parseInt(
money.substring(0, money.length() - 3));
- res = this.refundForWxpay(2, paylog.getTradeNo(),
+ res = refundForWxpay(1, paylog.getTradeNo(),
paylog.getOutTradeNo(), orderNo, totalFee,
- refundFee, "4");
+ refundFee, "2");
}
}
return res;
--
Gitblit v1.7.1