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:
张松
2025-10-31 17:08:35 +08:00
parent b4068fbd3b 2ef59654ef
commit 84cc064fd9
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -124,16 +124,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
PageHelper.startPage(page, size);
List<DistributionCenterShopVO> unActivates = mapper.selectUnDistributionShops(userId);
for (DistributionCenterShopVO unActivate : unActivates) {
//'pay购买开通 auto自动开通 manual手动开通'
if ("pay".equals(unActivate.getOpenType())) {
if (unActivate.getShopUser() == 1) {
unActivate.setLabelContent("曾进入过店铺");
}
} else if ("auto".equals(unActivate.getOpenType())) {
if (unActivate.getOrderCount() == 1) {
unActivate.setLabelContent("在本店下单过");
}
if (unActivate.getOrderCount() == 1) {
unActivate.setLabelContent("在本店下单过");
}else if (unActivate.getShopUser() == 1) {
unActivate.setLabelContent("曾进入过店铺");
}
// else if("manual".equals(unActivate.getOpenType())){
// unActivate.setLabelContent("manual手动开通");，

17
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java
View File

@@ -92,7 +92,22 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl<MkLimitTimeDisco
@Override
public MkLimitTimeDiscount getLimitTimeDiscountByShopId(Long shopId) {
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
return mapper.selectOneByShopId(mainShopId, shopId, CzgStrUtils.getStrWeek());
MkLimitTimeDiscount limitTimeDiscount = mapper.selectOneByShopId(mainShopId, shopId, CzgStrUtils.getStrWeek());
if (limitTimeDiscount != null && limitTimeDiscount.getFoodType() == 2 && StrUtil.isNotBlank(limitTimeDiscount.getFoods())) {
List<String> foodIds = Arrays.stream(limitTimeDiscount.getFoods().split(","))
.map(String::trim)
.filter(StrUtil::isNotBlank)
.distinct()
.toList();
List<String> ids = productService.listAs(QueryWrapper.create().select(Product::getId)
.eq(Product::getShopId, shopId).in(Product::getSyncId, foodIds), String.class);
if (CollUtil.isEmpty(ids)) {
limitTimeDiscount.setFoods("");
} else {
limitTimeDiscount.setFoods(String.join(",", ids));
}
}
return limitTimeDiscount;
}
@Override