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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 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 cf194a2..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
@@ -8,7 +8,8 @@
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.bean.profitsharingV3.ProfitSharingReceiver;
+import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverRequest;
+import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.exception.ServiceException;
@@ -38,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;
@@ -58,7 +59,7 @@
* @since 2023-04-25
*/
@Service
-@Slf4j
+@Log4j2
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
@Resource
@@ -209,7 +210,7 @@
}
//验证商户名唯一
- Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
+ //Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
if(mgtEditShopDto.getShopId()!=null){
//取消验重
/*if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
@@ -242,8 +243,9 @@
shop.setCreateTime(new Date());
shop.setCreateUserId(mgtEditShopDto.getUserId());
shop.setFrozenFlag(0);
- shop.setCooperativeFlag(0);
+ shop.setCooperativeFlag(1);
shop.setAuthFlag(0);
+ shop.setAccountFlag(0);
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
@@ -816,6 +818,7 @@
for(Shop shop : shopList){
shopIds.add(shop.getShopId());
}
+ userIds.add(userId);
}
}
//分别查询
@@ -858,7 +861,7 @@
if(shop.getFrozenFlag()==1){
String userKey = SecurityUtils.getUserKey();
redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
- throw new ServiceException("商户已被冻结",401);
+ throw new ServiceException("商户已被冻结,请联系管理员",401);
}
merHomeShopTotalVo.setShopType(shop.getShopType());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
@@ -1028,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());
@@ -1115,8 +1118,12 @@
String[] shopSalesKey = new String[shopSalesRank.size()];
BigDecimal[] shopSalesValue = new BigDecimal[shopSalesRank.size()];
// 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+ Long shopId;
+ Shop shop;
for (int i = 0; i < shopSalesRank.size(); i++) {
- shopSalesKey[i] = shopSalesRank.get(i).getMapKey();
+ shopId = Long.valueOf(shopSalesRank.get(i).getMapKey());
+ shop = this.getByShopId(shopId);
+ shopSalesKey[i] = shop.getShopName();
shopSalesValue[i] = shopSalesRank.get(i).getMapValue();
}
plTotalShopTotalVo.setShopSalesRankKey(shopSalesKey);
@@ -1363,8 +1370,8 @@
if (shopIdList != null && !shopIdList.isEmpty()) {
Integer count = remoteMemberService.getAreaNewMember(shopIdList).getData();
staffShopInfoGetVo.setNewAreaMember(count);
- ShopTotal shopTotalAll = shopTotalService.shopsTotalByIds(shopIdList);
- staffShopInfoGetVo.setAreaTurnover(shopTotalAll.getTotalOrderMoney());
+ AgencyTotalVo agencyTotalVo = remoteOrderService.getAgencyTotalVo(shopIdList).getData();
+ staffShopInfoGetVo.setAreaTurnover(agencyTotalVo.getAreaTurnover());
}
}
// 如果商店的扩展联系方式不为空，则设置员工商店信息对象的扩展联系方式列表
@@ -1594,11 +1601,38 @@
* @return void
*/
@Override
- public void addProfitSharingReceiver(ProfitSharingReceiver profitSharingReceiver){
+ public void addProfitSharingReceiver(MgtShopAuthGetDto mgtShopAuthGetDto){
try {
- ProfitSharingReceiver result = wechatPayUtils.addProfitSharingReceiver(profitSharingReceiver);
+ 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);
}
}
+
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/29 14:33
+ * @param
+ * @return List<MgtUserTaskMsgVo>
+ */
+ @Override
+ public List<MgtUserTaskMsgVo> getTaskMsgList(){
+ return shopMapper.getTaskMsgList();
+ }
+
}
--
Gitblit v1.7.1