From c97706c3cc213b7db3d381e8a0435ff0ef9a04d6 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 04 九月 2023 18:53:40 +0800
Subject: [PATCH] seata 同步 支付调整
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 ab3fdc2..4e0e998 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
@@ -39,7 +39,7 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -59,7 +59,7 @@
* @since 2023-04-25
*/
@Service
-@Slf4j
+@Log4j2
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
@Resource
@@ -245,6 +245,7 @@
shop.setFrozenFlag(0);
shop.setCooperativeFlag(1);
shop.setAuthFlag(0);
+ shop.setAccountFlag(0);
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
@@ -1030,7 +1031,7 @@
* @return void
*/
@Override
- public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException {
+ public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) {
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId());
Shop shop = this.getByShopId(shopAuthentication.getShopId());
@@ -1331,16 +1332,16 @@
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
merHomeShopTotalVo.setShopId(shopId);
// 通过远程订单服务获取商店总览信息
- //MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
+ MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
// 获取商店任务计数
Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
// 设置员工商店信息对象的属性
staffShopInfoGetVo.setTodayReservation(0);
- //staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
+ staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
staffShopInfoGetVo.setShopTask(taskCount);
- //staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
- //staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
- //staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
+ staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
+ staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
+ staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
staffShopInfoGetVo.setShopId(shopId);
staffShopInfoGetVo.setShopName(shop.getShopName());
staffShopInfoGetVo.setShopType(shop.getShopType());
@@ -1600,10 +1601,21 @@
* @return void
*/
@Override
- public ProfitSharingReceiverResult addProfitSharingReceiver(ProfitSharingReceiverRequest request){
+ public void addProfitSharingReceiver(MgtShopAuthGetDto mgtShopAuthGetDto){
try {
- ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request);
- return result;
+ ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthGetDto.getAuthId());
+ Shop shop = this.getByShopId(shopAuthentication.getShopId());
+ if(shopAuthentication!=null&&shopAuthentication.getAuditStatus()==6){
+ ProfitSharingReceiverRequest request = new ProfitSharingReceiverRequest();
+ request.setAccount(shopAuthentication.getSubMchid());
+ request.setName(shopAuthentication.getBlShopName());
+ ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request);
+ if(StringUtils.isNotBlank(result.getAccount())){
+ shop.setAccountFlag(1);
+ this.saveOrUpdate(shop);
+ }
+ }
+
} catch (WxPayException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1