From cfeca361311321474e2ed147db874946c652fc92 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 17:56:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index c5da45e..d50df4b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -6,8 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.exception.ServiceException;
@@ -21,15 +19,12 @@
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
import com.ruoyi.shop.domain.vo.*;
-import com.ruoyi.shop.enums.WxApplyMentStateEnum;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.util.WechatPayUtils;
-import com.ruoyi.shop.util.WxShopUtils;
-import com.ruoyi.shop.util.dto.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.config.SysTag;
@@ -976,7 +971,7 @@
shopAuthentication.setApplyNumber(applyNumber);
shopAuthentication.setAuditStatus(3);
shopAuthenticationService.saveOrUpdate(shopAuthentication);
- wechatPayUtils.ecommerceApply(shopAuthentication,applyNumber,shop);
+ //wechatPayUtils.ecommerceApply(shopAuthentication,applyNumber,shop);
}
/**
@@ -1356,7 +1351,7 @@
* @param applymentId
*/
private void queryApplyStatusByApplymentId(String applymentId, Long shopId) {
- try {
+ /*try {
if (StringUtils.isNotBlank(applymentId)) {
ApplymentsStatusResult result = wechatPayUtils.queryApplyStatusByApplymentId(applymentId);
shopAuthenticationService.updateAuditStatusByApplymentId(applymentId, result);
@@ -1367,7 +1362,7 @@
}
} catch (WxPayException e) {
e.printStackTrace();
- }
+ }*/
}
/**
--
Gitblit v1.7.1