修改bug

mitao

2024-08-14 07057a9a0c8624ec1876670e69b0631b1213793f

 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;
@@ -63,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;

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

@@ -99,8 +102,11 @@
    @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;
@@ -112,13 +118,14 @@
                    wrapper1.eq(OrderAuctionBond::getDelFlag,0);
                    OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
                    one1.setBoundStatus(BondStatusEnum.PAID);
                    one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
                    one1.setPaymentMethod(paymentMethodEnum);
                    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);
                    }
@@ -130,7 +137,7 @@
                    wrapper1.eq(Order::getDelFlag,0);
                    Order page1 = OrderMapper.selectOne(wrapper1);
                    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){
@@ -169,7 +176,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);
@@ -185,7 +192,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);
@@ -194,7 +201,7 @@

            }
        } catch (Exception e) {
            e.printStackTrace();
            log.info("获取异常", e);
        }
        return R.fail("获取异常");
    }
@@ -208,6 +215,7 @@
     */
    @Override
    public void notifyUrl(HttpServletRequest request, HttpServletResponse res) {
        log.info("=============================支付宝回调=============================");
        HttpServletResponse response = (HttpServletResponse) res;
        response.setContentType("text/html;charset=UTF-8");
        PrintWriter out;
@@ -320,7 +328,7 @@
                    log.debug("AlipayController.notifyUrl__回调逻辑代码处理异常！fail");
                    // 返回失败
                    out.println("fail");
                    e.printStackTrace();
                    log.error("AlipayController.notifyUrl__回调逻辑代码处理异常！fail", e);
                }
                // ////////////////////////////////////////////////////////////////////////////////////////
            } else {// 验证失败
@@ -330,7 +338,7 @@
        } catch (
                IOException e) {
            log.debug("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！");
            e.printStackTrace();
            log.error("AlipayController.notifyUrl__支付宝服务器异步通知数据处理失败！", e);
        }
    }

@@ -508,6 +516,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 +537,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();
@@ -730,11 +743,6 @@
        System.out.println("微信退款结果: " + xmlResult);
        return true;
    }

    public static void main(String[] args) {
        refundForWxpay(4, "4200002335202408022336923702",
                "BO24080216090001", "R123456789", 1, 1, "2");
    }
    /**
     * 获取支付宝
     *
@@ -743,7 +751,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 +759,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 +774,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);