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

商家申请记录 填充商家名称

Browse Source 
消费返现
This commit is contained in:
wangw
2025-10-16 18:21:58 +08:00
parent 1e480dd2d9
commit 9bdb09232c
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java
View File

@@ -84,4 +84,6 @@ public class SmsShopTemplateDTO implements Serializable {
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
private String shopName;
}

18
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.czg.service.market.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.czg.account.entity.ShopInfo;
import com.czg.account.service.ShopInfoService;
import com.czg.config.RabbitPublisher;
import com.czg.market.dto.SmsShopTemplateDTO;
import com.czg.market.dto.SmsTemplateQueryDTO;
@@ -13,6 +15,7 @@ import com.czg.market.entity.SmsShopTemplate;
import com.czg.market.service.SmsShopTemplateService;
import com.czg.service.market.mapper.SmsShopTemplateMapper;
import jakarta.annotation.Resource;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@@ -29,6 +32,8 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
@Resource
private RabbitPublisher rabbitPublisher;
@DubboReference
private ShopInfoService shopInfoService;
@Override
public List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId, Integer status) {
@@ -61,7 +66,18 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
.eq(SmsShopTemplate::getShopId, param.getShopId())
.orderBy(SmsShopTemplate::getShopId).asc()
.orderBy(SmsShopTemplate::getSort).asc();
return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);
Page<SmsShopTemplateDTO> page = pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);
if (param.getShopId() == null) {
Map<Long, String> shopNameMap = new HashMap<>();
for (SmsShopTemplateDTO record : page.getRecords()) {
if (!shopNameMap.containsKey(record.getShopId())) {
ShopInfo shopInfo = shopInfoService.getById(record.getShopId());
shopNameMap.put(record.getShopId(), shopInfo.getShopName());
}
record.setShopName(shopNameMap.get(record.getShopId()));
}
}
return page;
}
@Override

5
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -133,6 +133,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
private MkDiscountActivityService discountActService;
@Resource
private MkShopRechargeService shopRechargeService;
@Resource
private MkConsumeCashbackService consumeCashbackService;
// 延迟 5 秒
private static final long DELAY = 5;
//重试次数
@@ -1090,6 +1092,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|| (payType != null && !ArrayUtil.contains(payTypes, payType))) {
//下单赠送积分
pointsService.consumeAwardPoints(shopUser.getId(), orderInfo);
if(!orderInfo.getPayType().equals(PayEnums.CASH_PAY.getValue())){
consumeCashbackService.cashback(orderInfo.getShopId(), shopUser.getUserId(), orderInfo.getPayAmount(), orderInfo.getId(), orderInfo.getOrderNo());
}
}
}
}