修改bug

mitao

2024-08-12 aeb379749ad10eabd54086e93231228a48c69843

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.order.service.impl;

import com.alibaba.fastjson2.JSON;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradeRefundRequest;
@@ -30,6 +31,7 @@
import com.ruoyi.system.api.domain.GoodsGroupPurchase;
import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.Order;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
@@ -62,6 +64,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

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

@@ -96,7 +100,11 @@
    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) {
        Member member = memberClient.getMembeOne(uid, SecurityConstants.INNER).getData();
        openId = member.getMiniOpenid();
        String zfbOpenid = member.getZfbOpenid();
        Double price = 0.0;
        String subject;
        String body;
@@ -165,7 +173,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);
@@ -181,7 +189,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);
@@ -302,21 +310,6 @@

                                }
                            }

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

                    }
@@ -474,20 +467,7 @@

                            }
                        }
                        if (page1.getPoints()!=0){
                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                            memberPointsDTO.setMemberId(page1.getMemberId());
                            memberPointsDTO.setPointsType(1);
                            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                            memberPointsDTO.setPoints(page1.getPoints());
                            memberClient.addMemberPoints(memberPointsDTO);
                        }
                        updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
                        MembeOneDTO.setType(1);
                        MembeOneDTO.setMemberId(page1.getMemberId());
                        MembeOneDTO.setMoney(page1.getTotalAmount());
                        MembeOneDTO.setTotalPoints(page1.getPoints());
                        memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);

                    }

                    log.debug("WxpayController.notify__回调处理成功：SUCCESS");
@@ -552,20 +532,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();
@@ -751,10 +735,14 @@
        System.out.println("证书: " + Configure.getCertLocalPath_2());

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

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

    public static void main(String[] args) {
        refundForWxpay(4, "4200002335202408022336923702",
                "BO24080216090001", "R123456789", 1, 1, "2");
    }
    /**
     * 获取支付宝
     *