From 584f9dabe69803d8eb6e20dd377d74995fd5c699 Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Thu, 4 Jan 2024 00:07:34 +0800 Subject: [PATCH] init --- .../cai/controller/admin/CityController.java | 27 +++++++++++++++++++ .../admin/ConsumeLogController.java | 12 ++++----- .../{CaiConsumeLog.java => ConsumeLog.java} | 2 +- .../ruoyi/cai/mapper/ConsumeLogMapper.java | 4 +-- .../com/ruoyi/cai/service/AccountService.java | 4 +-- .../com/ruoyi/cai/service/CitysService.java | 2 ++ .../ruoyi/cai/service/ConsumeLogService.java | 4 +-- .../cai/service/impl/AccountServiceImpl.java | 4 +-- .../cai/service/impl/CitysServiceImpl.java | 5 ++++ .../service/impl/ConsumeLogServiceImpl.java | 4 +-- .../service/impl/GuardTotalServiceImpl.java | 2 +- .../cai/service/impl/UserGiftServiceImpl.java | 2 +- .../resources/mapper/cai/ConsumeLogMapper.xml | 2 +- 13 files changed, 54 insertions(+), 20 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CityController.java rename ruoyi-cai/src/main/java/com/ruoyi/cai/domain/{CaiConsumeLog.java => ConsumeLog.java} (98%) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CityController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CityController.java new file mode 100644 index 00000000..f6a3c735 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CityController.java @@ -0,0 +1,27 @@ +package com.ruoyi.cai.controller.admin; + + +import com.ruoyi.cai.service.CitysService; +import com.ruoyi.common.core.domain.R; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/city") +public class CityController { + + @Autowired + private CitysService citysService; + + @GetMapping("/resetRedis") + public R resetRedis(){ + citysService.resetRedis(); + return R.ok(); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java index fa4961ea..60a3323a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiConsumeLog; +import com.ruoyi.cai.domain.ConsumeLog; import com.ruoyi.cai.service.ConsumeLogService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +41,8 @@ public class ConsumeLogController extends BaseController { */ @SaCheckPermission("cai:consumeLog:list") @GetMapping("/list") - public TableDataInfo list(CaiConsumeLog bo, PageQuery pageQuery) { - Page page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(ConsumeLog bo, PageQuery pageQuery) { + Page page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } @@ -53,7 +53,7 @@ public class ConsumeLogController extends BaseController { */ @SaCheckPermission("cai:consumeLog:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(consumeLogService.getById(id)); } @@ -65,7 +65,7 @@ public class ConsumeLogController extends BaseController { @Log(title = "消费记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CaiConsumeLog bo) { + public R add(@Validated(AddGroup.class) @RequestBody ConsumeLog bo) { return toAjax(consumeLogService.save(bo)); } @@ -76,7 +76,7 @@ public class ConsumeLogController extends BaseController { @Log(title = "消费记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody CaiConsumeLog bo) { + public R edit(@Validated(EditGroup.class) @RequestBody ConsumeLog bo) { return toAjax(consumeLogService.updateById(bo)); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ConsumeLog.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ConsumeLog.java index 875a14fe..50613c95 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ConsumeLog.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cai_consume_log") -public class CaiConsumeLog implements Serializable { +public class ConsumeLog implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java index 500da2f6..0f2d5486 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cai.domain.CaiConsumeLog; +import com.ruoyi.cai.domain.ConsumeLog; /** * 消费记录Mapper接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiConsumeLog; * @author 77 * @date 2023-12-24 */ -public interface ConsumeLogMapper extends BaseMapper { +public interface ConsumeLogMapper extends BaseMapper { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java index 314f57eb..1dbf8924 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.Account; -import com.ruoyi.cai.domain.CaiConsumeLog; +import com.ruoyi.cai.domain.ConsumeLog; import com.ruoyi.cai.dto.admin.vo.AccountAdminVo; import com.ruoyi.common.core.domain.PageQuery; @@ -17,7 +17,7 @@ public interface AccountService extends IService { Account getByUserId(Long userId); - CaiConsumeLog decr(CaiConsumeLog log); + ConsumeLog decr(ConsumeLog log); void withdraw(Long userId, Long incomeCoin); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java index b618bc22..364e914c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java @@ -13,6 +13,8 @@ import java.util.Map; */ public interface CitysService extends IService { + void resetRedis(); + Map all(); String getByCityId(Integer cityId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java index 1306ee81..e273e25c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.cai.domain.CaiConsumeLog; +import com.ruoyi.cai.domain.ConsumeLog; /** * 消费记录Service接口 @@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiConsumeLog; * @author 77 * @date 2023-12-24 */ -public interface ConsumeLogService extends IService { +public interface ConsumeLogService extends IService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java index 927a66ab..efc489a7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java @@ -46,7 +46,7 @@ public class AccountServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - public CaiConsumeLog decr(CaiConsumeLog consumeLog) { + public ConsumeLog decr(ConsumeLog consumeLog) { log.info("开始扣费 consumeLog={}", JSON.toJSONString(consumeLog)); Long userId = consumeLog.getSourceUserId(); Long amount = consumeLog.getAmount(); @@ -108,7 +108,7 @@ public class AccountServiceImpl extends ServiceImpl impl return baseMapper.pageAdmin(pageQuery.build(),bo); } - private void fenxiao(CaiConsumeLog consumeLog){ + private void fenxiao(ConsumeLog consumeLog){ if(ConsumeLogType.PAY.getCode().equals(consumeLog.getType())){ Long sourceUserId = consumeLog.getSourceUserId(); UserInvite userInvite = userInviteService.getByUserId(sourceUserId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java index 07f4b240..fdd65a86 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java @@ -32,6 +32,11 @@ public class CitysServiceImpl extends ServiceImpl implements @PostConstruct public void init() { + this.resetRedis(); + } + + @Override + public void resetRedis(){ List list = this.list(); Map map = list.stream().collect(Collectors.toMap(i -> String.valueOf(i.getId()), Citys::getName)); redisTemplate.opsForHash().putAll(RedisConstant.CITY_CACHE_REDIS, map); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java index a1985807..f8f573f4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.CaiConsumeLog; +import com.ruoyi.cai.domain.ConsumeLog; import com.ruoyi.cai.mapper.ConsumeLogMapper; import com.ruoyi.cai.service.ConsumeLogService; import org.springframework.stereotype.Service; @@ -13,6 +13,6 @@ import org.springframework.stereotype.Service; * @date 2023-12-24 */ @Service -public class ConsumeLogServiceImpl extends ServiceImpl implements ConsumeLogService { +public class ConsumeLogServiceImpl extends ServiceImpl implements ConsumeLogService { } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java index 159d9330..6eba4e56 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java @@ -88,7 +88,7 @@ public class GuardTotalServiceImpl extends ServiceImpl i Anchor anchor = anchorService.getByUserId(query.getToUserId()); Long price = gift.getPrice(); Long giftAmount = query.getGiftCount() * price; - CaiConsumeLog consumeLog = new CaiConsumeLog(); + ConsumeLog consumeLog = new ConsumeLog(); consumeLog.init(fromUser,toUser); consumeLog.setType(ConsumeLogType.GIFT.getCode()); consumeLog.setAmount(giftAmount); diff --git a/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml index 3bff6efa..c2dcd8d1 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +