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-16 16:46:11 +08:00
parent 04a45099a9 2f727b65e6
commit bd61e9d512
8 changed files with 109 additions and 7 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/SmsShopMoneyDetailServiceImpl.java
View File

@@ -1,5 +1,7 @@
package com.czg.service.market.service.impl;
import com.czg.TimeQueryParam;
import com.czg.market.dto.SmsMoneyDetailDto;
import com.czg.market.dto.SmsShopMoneyDetailDTO;
import com.czg.market.entity.SmsShopMoneyDetail;
import com.czg.market.service.SmsShopMoneyDetailService;
@@ -31,6 +33,18 @@ public class SmsShopMoneyDetailServiceImpl extends ServiceImpl<SmsShopMoneyDetai
return pageAs(PageUtil.buildPage(), queryWrapper, SmsShopMoneyDetailDTO.class);
}
@Override
public Page<SmsShopMoneyDetailDTO> getSmsMoneyDetail2(Long shopId, SmsMoneyDetailDto param) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq(SmsShopMoneyDetail::getShopId, shopId)
.eq(SmsShopMoneyDetail::getIsDel, 0)
.ge(SmsShopMoneyDetail::getCreateTime, param.getStartTime())
.le(SmsShopMoneyDetail::getCreateTime, param.getEndTime())
.eq(SmsShopMoneyDetail::getType, param.getType())
.orderBy(SmsShopMoneyDetail::getCreateTime).desc();
return pageAs(PageUtil.buildPage(), queryWrapper, SmsShopMoneyDetailDTO.class);
}
@Override
public Long countSendTotal(Long shopId) {
QueryWrapper queryWrapper = new QueryWrapper()

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

@@ -30,13 +30,18 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
private RabbitPublisher rabbitPublisher;
@Override
public List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId) {
public List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId, Integer status) {
List<Long> list = Arrays.asList(1L, shopId);
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.like(SmsShopTemplate::getTitle, name)
.in(SmsShopTemplate::getShopId, list)
.orderBy(SmsShopTemplate::getShopId).asc()
.orderBy(SmsShopTemplate::getSort).asc();
if (shopId != 1L) {
queryWrapper.eq(SmsShopTemplate::getStatus, status);
} else {
queryWrapper.eq(SmsShopTemplate::getStatus, 1);
}
return listAs(queryWrapper, SmsShopTemplateDTO.class);
}
@@ -44,8 +49,24 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
public void addTemplate(SmsShopTemplateDTO param) {
SmsShopTemplate template = BeanUtil.toBean(param, SmsShopTemplate.class);
template.setStatus(0);
if (template.getShopId().equals(1L)) {
template.setSort(0);
template.setShopUse(1);
template.setStatus(2);
}
save(template);
sendApplyMsg(template.getShopId(), template.getId());
if (!template.getShopId().equals(1L)) {
sendApplyMsg(template.getShopId(), template.getId());
}
}
@Override
public void shopUse(SmsShopTemplateDTO param) {
SmsShopTemplate template = new SmsShopTemplate();
param.setId(param.getId());
param.setShopUse(param.getShopUse());
param.setIsDel(param.getIsDel());
updateById(template);
}
@Override