修改bug

mitao

2024-08-14 8dceb015ec8bd9642297d757e73936af84f4aaf1

 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;
@@ -12,9 +13,11 @@
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.OrderFromEnum;
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.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
@@ -29,7 +32,9 @@
import com.ruoyi.order.util.tencent.common.XMLParser;
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsSeckill;
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;
@@ -50,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;
@@ -62,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;

/**
@@ -72,6 +79,7 @@
 * @author mitao
 * @since 2024-05-22
 */
@Slf4j
@Service
public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService {

@@ -96,7 +104,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;
@@ -107,14 +121,10 @@
                    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<>();
                        // Type 1是否需要支付
                        returnMap.put("Type",1);
                        return R.ok(returnMap);
                    }
@@ -125,52 +135,44 @@
                    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);
                    // 判断商品库存
                    Long goodsSkuId = page1.getGoodsSkuId();
                    OrderFromEnum orderFrom = page1.getOrderFrom();
                    switch (orderFrom) {
                        case COMMODITY_ORDER:
                            GoodsSku goods = goodsSkuClient.getGoodsSkuOne(goodsSkuId,
                                    SecurityConstants.INNER).getData();
                            if (Objects.isNull(goods)) {
                                throw new ServiceException("该商品已下架");
                            }
                            if (goods.getStock() <= 0) {
                                throw new ServiceException("该商品已售罄");
                            }
                            if (goods.getStock() < page1.getGoodsQuantity()) {
                                throw new ServiceException("该商品库存不足");
                            }
                            break;
                        case SNAP_ORDERS:
                            GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(goodsSkuId,
                                    SecurityConstants.INNER).getData();
                            if (Objects.isNull(data)) {
                                throw new ServiceException("该商品已下架");
                            }
                            if (data.getSeckillStock() <= 0) {
                                throw new ServiceException("该商品已售罄");
                            }
                            if (data.getSeckillStock() < page1.getGoodsQuantity()) {
                                throw new ServiceException("该商品库存不足");
                            }
                            break;
                        default:
                            break;
                    }
                    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());
@@ -190,73 +192,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 +202,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 +218,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 +227,7 @@

            }
        } catch (Exception e) {
            e.printStackTrace();
            log.info("获取异常", e);
        }
        return R.fail("获取异常");
    }
@@ -306,6 +241,7 @@
     */
    @Override
    public void notifyUrl(HttpServletRequest request, HttpServletResponse res) {
        log.info("=============================支付宝回调=============================");
        HttpServletResponse response = (HttpServletResponse) res;
        response.setContentType("text/html;charset=UTF-8");
        PrintWriter out;
@@ -385,6 +321,8 @@
                                if (goodsSeckiGoodsGroupPurchaseInfo!=null){
                                    page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
                                    OrderMapper.updateById(page1);
                                    Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity();
                                    goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i);
                                    goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);

                                }else{
@@ -394,6 +332,7 @@
                                    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);
@@ -401,26 +340,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");
@@ -432,7 +354,7 @@
                    log.debug("AlipayController.notifyUrl__回调逻辑代码处理异常！fail");
                    // 返回失败
                    out.println("fail");
                    e.printStackTrace();
                    log.error("AlipayController.notifyUrl__回调逻辑代码处理异常！fail", e);
                }
                // ////////////////////////////////////////////////////////////////////////////////////////
            } else {// 验证失败
@@ -442,7 +364,7 @@
        } catch (
                IOException e) {
            log.debug("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！");
            e.printStackTrace();
            log.error("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！", e);
        }
    }

@@ -469,134 +391,124 @@
            System.out.println("WxpayController.notify__notityXml：\n" + notityXml);

            // 验证签名
                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);
                        paylog.setBuyerId(buyer_id);
                        paylog.setTradeNo(trade_no);
                        paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
                        paylog.setState(1);
                        System.out.println("支付完成时间" + time_end);
                        paylog.setAddTime(LocalDateTime.now());
                        this.save(paylog);
                        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));
                LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
                wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
                Paylog one = this.getOne(wrapper);
                if(SinataUtil.isEmpty(one)) {
                    Paylog paylog = new Paylog();
                    paylog.setOutTradeNo(out_trade_no);
                    paylog.setPayType(2);
                    paylog.setBuyerId(buyer_id);
                    paylog.setTradeNo(trade_no);
                    paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
                    paylog.setState(1);
                    System.out.println("支付完成时间" + time_end);
                    paylog.setAddTime(LocalDateTime.now());
                    this.save(paylog);
                    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));

                                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");
                            }

                            one1.setBoundStatus(BondStatusEnum.PAID);
                            one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
                            orderAuctionBondMapper.updateById(one1);

                        }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());


                            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);
                            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);

                    }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());


                        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){
                                page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
                                OrderMapper.updateById(page1);
                                Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity();
                                goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i);
                                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.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__回调处理：验证状态错误！" + result_code);
                System.out.println("验证状态错误！" + result_code);
            }

        } catch (Exception e) {
            e.printStackTrace();
@@ -630,6 +542,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;
@@ -650,20 +563,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();
@@ -725,7 +642,7 @@
            //设置请求参数(总金额)

            String money=SinataUtil.doubleRetainTwo(price*100d);
           Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
            Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
            paraMap.put("total_fee", price1.toString());
            //设置请求参数(通知地址)
            paraMap.put("notify_url", Configure.wx_notify_url);
@@ -744,7 +661,7 @@
            Map<String, String> map = PaymentKit.xmlToMap(xmlResult);
            //返回状态码
            String returnCode = map.get("return_code");
      /*      Assert.isTrue("SUCCESS".equals(returnCode), getMsgByCode(returnCode));*/
            /*      Assert.isTrue("SUCCESS".equals(returnCode), getMsgByCode(returnCode));*/

            //返回给小程序端需要的参数
            Map<String, Object> returnMap = new HashMap<>(20);
@@ -849,10 +766,9 @@
        System.out.println("证书: " + Configure.getCertLocalPath_2());

        String xmlResult = WxPayApi.orderRefund(false, paraMap,Configure.getCertLocalPath_2(), Configure.getMchid());

        System.out.println("微信退款结果: " + xmlResult);
        return true;
    }

    /**
     * 获取支付宝
     *
@@ -861,7 +777,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");
        // 支付宝交易号
@@ -869,12 +785,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");
        // 支付时间
@@ -884,7 +800,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);
@@ -893,11 +809,11 @@
        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 退款数据传输对象
@@ -972,7 +888,7 @@
    }

    private Boolean handleRefund(Paylog paylog, BigDecimal amount,
            String orderNo) {
                                 String orderNo) {
        boolean res = false;
        if (StringUtils.isNotNull(paylog)) {
            if (paylog.getPayType() == 1) {