init
This commit is contained in:
@@ -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<Void> resetRedis(){
|
||||
citysService.resetRedis();
|
||||
return R.ok();
|
||||
}
|
||||
}
|
||||
@@ -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<CaiConsumeLog> list(CaiConsumeLog bo, PageQuery pageQuery) {
|
||||
Page<CaiConsumeLog> page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
|
||||
public TableDataInfo<ConsumeLog> list(ConsumeLog bo, PageQuery pageQuery) {
|
||||
Page<ConsumeLog> 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<CaiConsumeLog> getInfo(@NotNull(message = "主键不能为空")
|
||||
public R<ConsumeLog> 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<Void> add(@Validated(AddGroup.class) @RequestBody CaiConsumeLog bo) {
|
||||
public R<Void> 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<Void> edit(@Validated(EditGroup.class) @RequestBody CaiConsumeLog bo) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ConsumeLog bo) {
|
||||
return toAjax(consumeLogService.updateById(bo));
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<CaiConsumeLog> {
|
||||
public interface ConsumeLogMapper extends BaseMapper<ConsumeLog> {
|
||||
|
||||
}
|
||||
|
||||
@@ -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> {
|
||||
|
||||
Account getByUserId(Long userId);
|
||||
|
||||
CaiConsumeLog decr(CaiConsumeLog log);
|
||||
ConsumeLog decr(ConsumeLog log);
|
||||
|
||||
void withdraw(Long userId, Long incomeCoin);
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@ import java.util.Map;
|
||||
*/
|
||||
public interface CitysService extends IService<Citys> {
|
||||
|
||||
void resetRedis();
|
||||
|
||||
Map<Long,String> all();
|
||||
|
||||
String getByCityId(Integer cityId);
|
||||
|
||||
@@ -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<CaiConsumeLog> {
|
||||
public interface ConsumeLogService extends IService<ConsumeLog> {
|
||||
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> 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<AccountMapper, Account> 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);
|
||||
|
||||
@@ -32,6 +32,11 @@ public class CitysServiceImpl extends ServiceImpl<CitysMapper, Citys> implements
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
this.resetRedis();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resetRedis(){
|
||||
List<Citys> list = this.list();
|
||||
Map<String, String> map = list.stream().collect(Collectors.toMap(i -> String.valueOf(i.getId()), Citys::getName));
|
||||
redisTemplate.opsForHash().putAll(RedisConstant.CITY_CACHE_REDIS, map);
|
||||
|
||||
@@ -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<ConsumeLogMapper,CaiConsumeLog> implements ConsumeLogService {
|
||||
public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, ConsumeLog> implements ConsumeLogService {
|
||||
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ public class GuardTotalServiceImpl extends ServiceImpl<GuardTotalMapper, GuardTo
|
||||
throw new ServiceException("守护价格发生变化");
|
||||
}
|
||||
Long guardValue = query.getGuardNum() * guardPrice;
|
||||
CaiConsumeLog consumeLog = new CaiConsumeLog();
|
||||
ConsumeLog consumeLog = new ConsumeLog();
|
||||
consumeLog.init(fromUser,toUser);
|
||||
consumeLog.setType(ConsumeLogType.GUARD.getCode());
|
||||
consumeLog.setAmount(guardValue);
|
||||
|
||||
@@ -52,7 +52,7 @@ public class UserGiftServiceImpl extends ServiceImpl<UserGiftMapper, UserGift> 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);
|
||||
|
||||
Reference in New Issue
Block a user