czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
gong
2026-01-29 09:42:59 +08:00
parent 2d15315b79 abcd0fbc7b
commit fcd70b24a8
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java
View File

@@ -5,7 +5,6 @@ import com.czg.account.entity.ShopInfo;
import com.czg.exception.CzgException;
import com.mybatisflex.core.service.IService;
import java.io.Serializable;
import java.util.List;
/**
@@ -16,7 +15,7 @@ import java.util.List;
*/
public interface ShopConfigService extends IService<ShopConfig> {
ShopInfo getShopInfoAndConfig(Serializable id) throws CzgException;
ShopInfo getShopInfoAndConfig(Long id) throws CzgException;
void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String name, String useShopType, List<Long> shopIdList);

3
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java
View File

@@ -14,7 +14,6 @@ import jakarta.annotation.Resource;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.cache.annotation.Cacheable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -37,7 +36,7 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
@Override
@Cacheable(cacheNames = "shopInfo",key = "#id")
public ShopInfo getShopInfoAndConfig(Serializable id) throws CzgException {
public ShopInfo getShopInfoAndConfig(Long id) throws CzgException {
ShopInfo shopInfo = shopInfoMapper.selectOneById(id);
if (shopInfo == null) {
throw new CzgException("店铺不存在");

2
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
@Override
public ShopInfo getById(Serializable id) throws CzgException {
return shopConfigService.getShopInfoAndConfig(id);
return shopConfigService.getShopInfoAndConfig((Long) id);
}
@Override

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCarouselServiceImpl.java
View File

@@ -36,9 +36,11 @@ public class MkCarouselServiceImpl extends ServiceImpl<MkCarouselMapper, MkCarou
}
List<MkCarousel> list = list(queryWrapper);
list.forEach(mkCarousel -> {
MiniAppPages miniAppPages = miniAppPageService.getById(mkCarousel.getJumpPageId());
if (miniAppPages != null) {
mkCarousel.setJumpPagePath(miniAppPages.getPath());
if (mkCarousel.getJumpPageId() != null) {
MiniAppPages miniAppPages = miniAppPageService.getById(mkCarousel.getJumpPageId());
if (miniAppPages != null) {
mkCarousel.setJumpPagePath(miniAppPages.getPath());
}
}
});
return list;