From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
index e5afe26..7d46d76 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
@@ -10,10 +10,12 @@
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
import com.ruoyi.shop.service.shop.ShopStaffService;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.CodeGetDto;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.dto.MgtShopStaffEditDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
+import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.service.RemoteSysStaffService;
import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;
@@ -41,6 +43,8 @@
@Resource
private RemoteSysStaffService remoteSysStaffService;
+ @Resource
+ private RemoteFileService remoteFileService;
/**
*
* @param userId
@@ -82,8 +86,17 @@
merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime());
merStaffInfoVo.setShopType(shop.getShopType());
merStaffInfoVo.setShopNumber(shop.getShopNumber());
- String shopCodeUrl = "https://wxapp.hhhrt.cn/mini/shop?shopId="+shop.getShopId();
- merStaffInfoVo.setShopCodeUrl(shopCodeUrl);
+ if(StringUtils.isNotBlank(shop.getShopCode())){
+ merStaffInfoVo.setShopCodeUrl(shop.getShopCode());
+ }else{
+ CodeGetDto codeGetDto = new CodeGetDto();
+ String url = "https://wxapp.hhhrt.cn/mini/shop?id="+shop.getShopId();
+ codeGetDto.setUrl(url);
+ codeGetDto.setFileName("shop-"+shop.getShopId());
+ String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
+ merStaffInfoVo.setShopCodeUrl(codeUrl);
+ shopStaffMapper.updateShopCodeUrl(shop.getShopId(),codeUrl);
+ }
return merStaffInfoVo;
}
--
Gitblit v1.7.1