From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/WechatPayUtils.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/WechatPayUtils.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/WechatPayUtils.java
index 13e8b7f..14eae48 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/WechatPayUtils.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/WechatPayUtils.java
@@ -1,8 +1,18 @@
package com.ruoyi.shop.util;
+import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsRequest;
+import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsResult;
+import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsStatusResult;
import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.EcommerceService;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.ruoyi.shop.domain.pojo.shop.ShopAuthentication;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 微信支付
@@ -11,12 +21,12 @@
@AllArgsConstructor
public class WechatPayUtils {
- //private final WxPayService wxService;
+ private final WxPayService wxService;
/**
* 电商二级商户进件（提交申请单）
*/
- /*public void ecommerceApply(ShopAuthentication shopAuthentication, String applyNumber, Shop shop) throws WxPayException {
+ public ApplymentsResult ecommerceApply(ShopAuthentication shopAuthentication, String applyNumber, Shop shop) throws WxPayException {
EcommerceService ecommerceService = wxService.getEcommerceService();
ApplymentsRequest request = new ApplymentsRequest();
//生成提交类
@@ -96,18 +106,18 @@
request.setBusinessAdditionPics(shopAuthentication.getBaPics());
request.setBusinessAdditionDesc(shopAuthentication.getBaDesc());
- ApplymentsResult result = ecommerceService.createApply(request);
+ return ecommerceService.createApply(request);
}
- *//**
+ /**
* 通过查询申请状态API查询二级商户入驻申请结果
- * @param applyNumber 业务申请编号
+ * @param applymentId 微信支付申请单号
* @return 申请状态
* @throws WxPayException
- *//*
- public ApplymentsStatusResult queryApplyStatusByOutRequestNo(String applyNumber) throws WxPayException {
- return wxService.getEcommerceService().queryApplyStatusByOutRequestNo(applyNumber);
- }*/
+ */
+ public ApplymentsStatusResult queryApplyStatusByApplymentId(String applymentId) throws WxPayException {
+ return wxService.getEcommerceService().queryApplyStatusByApplymentId(applymentId);
+ }
}
--
Gitblit v1.7.1