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 17:19:10 +08:00
parent 41511d4f75
commit 3baab6ce6f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/market-server/src/main/java/com/czg/controller/admin/SmsShopTemplateController.java
View File

@@ -52,13 +52,14 @@ public class SmsShopTemplateController {
@GetMapping("/smsTemplate") @GetMapping("/smsTemplate")
public CzgResult<List<SmsShopTemplateDTO>> getTemplateList(@RequestParam(required = false) String title, public CzgResult<List<SmsShopTemplateDTO>> getTemplateList(@RequestParam(required = false) String title,
@RequestParam(required = false) Integer status) { @RequestParam(required = false) Integer status) {
List<SmsShopTemplateDTO> data = templateService.getTemplateList(title, StpKit.USER.getShopId(),status); List<SmsShopTemplateDTO> data = templateService.getTemplateList(title, StpKit.USER.getShopId(), status);
return CzgResult.success(data); return CzgResult.success(data);
} }
/** /**
* 平台 商家申请记录 * 平台 商家申请记录
*/ */
@SaAdminCheckRole("管理员")
@PostMapping("/smsTemplate/query") @PostMapping("/smsTemplate/query")
public CzgResult<Page<SmsShopTemplateDTO>> getTemplateList2(@RequestBody SmsTemplateQueryDTO param) { public CzgResult<Page<SmsShopTemplateDTO>> getTemplateList2(@RequestBody SmsTemplateQueryDTO param) {
Page<SmsShopTemplateDTO> data = templateService.getTemplateList2(param); Page<SmsShopTemplateDTO> data = templateService.getTemplateList2(param);
@@ -84,7 +85,7 @@ public class SmsShopTemplateController {
@SaAdminCheckRole("管理员") @SaAdminCheckRole("管理员")
@PostMapping("/smsMoneyDetail/query") @PostMapping("/smsMoneyDetail/query")
public CzgResult<Page<SmsShopMoneyDetailDTO>> getSmsMoneyDetail2(@RequestBody SmsMoneyDetailDto param) { public CzgResult<Page<SmsShopMoneyDetailDTO>> getSmsMoneyDetail2(@RequestBody SmsMoneyDetailDto param) {
Page<SmsShopMoneyDetailDTO> data = smsMoneyDetailService.getSmsMoneyDetail2(StpKit.USER.getShopId(),param); Page<SmsShopMoneyDetailDTO> data = smsMoneyDetailService.getSmsMoneyDetail2(StpKit.USER.getShopId(), param);
return CzgResult.success(data); return CzgResult.success(data);
} }
@@ -153,7 +154,7 @@ public class SmsShopTemplateController {
moneyDetail.setBalance(shopMoney.getMoney()); moneyDetail.setBalance(shopMoney.getMoney());
moneyDetail.setSendRows(0L); moneyDetail.setSendRows(0L);
smsMoneyDetailService.save(moneyDetail); smsMoneyDetailService.save(moneyDetail);
shopMoneyMapper.update(shopMoney,true); shopMoneyMapper.update(shopMoney, true);
return CzgResult.success(); return CzgResult.success();
} }

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

@@ -11,4 +11,6 @@ import lombok.Data;
@Data @Data
public class SmsTemplateQueryDTO extends TimeQueryParam { public class SmsTemplateQueryDTO extends TimeQueryParam {
private Integer status; private Integer status;
private Integer shopUse;
private Integer shopId;
} }

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

@@ -54,6 +54,8 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
.le(SmsShopTemplate::getCreateTime, param.getEndTime()) .le(SmsShopTemplate::getCreateTime, param.getEndTime())
.ge(SmsShopTemplate::getCreateTime, param.getStartTime()) .ge(SmsShopTemplate::getCreateTime, param.getStartTime())
.eq(SmsShopTemplate::getStatus, param.getStatus()) .eq(SmsShopTemplate::getStatus, param.getStatus())
.eq(SmsShopTemplate::getShopUse, param.getShopUse())
.eq(SmsShopTemplate::getShopId, param.getShopId())
.orderBy(SmsShopTemplate::getShopId).asc() .orderBy(SmsShopTemplate::getShopId).asc()
.orderBy(SmsShopTemplate::getSort).asc(); .orderBy(SmsShopTemplate::getSort).asc();
return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class); return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);