shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-26 17:10:37 +08:00
parent 747bc38a28
commit 8531cf8c12
40 changed files with 385 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
View File

@@ -18,6 +18,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
@RestController
@RequestMapping("/cai/accountCash")
@Slf4j
public class AccountCashController extends BaseController {
private final AccountCashService accountCashService;
@@ -73,7 +75,8 @@ public class AccountCashController extends BaseController {
@PostMapping(value = "/importAudit", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<ExportBatchAuditVo> importData(@RequestPart("file") MultipartFile file) throws Exception {
List<AccountCashAdminVo> result = ExcelUtil.importExcel(file.getInputStream(), AccountCashAdminVo.class);
ExportBatchAuditVo audit = accountCashService.batchAudit(result);
List<Long> ids = result.stream().map(AccountCash::getId).collect(Collectors.toList());
ExportBatchAuditVo audit = accountCashService.batchAudit(ids);
return R.ok(audit);
}
@@ -94,12 +97,7 @@ public class AccountCashController extends BaseController {
@RepeatSubmit()
@GetMapping("/success")
public R<Void> success(Long id) {
accountCashService.update(Wrappers.lambdaUpdate(AccountCash.class)
.set(AccountCash::getVerifyTime, LocalDateTime.now())
.set(AccountCash::getOperateIp, ServletUtils.getClientIP())
.set(AccountCash::getStatus, AccountCashStatusEnum.SUCCESS.getCode())
.eq(AccountCash::getStatus, AccountCashStatusEnum.READY.getCode())
.eq(AccountCash::getId,id));
accountCashService.success(id);
return R.ok();
}
@@ -131,15 +129,10 @@ public class AccountCashController extends BaseController {
@Log(title = "用户提现批量通过", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@GetMapping("/batchSuccess")
public R<Void> batchSuccess(String ids) {
List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
accountCashService.update(Wrappers.lambdaUpdate(AccountCash.class)
.set(AccountCash::getVerifyTime, LocalDateTime.now())
.set(AccountCash::getOperateIp, ServletUtils.getClientIP())
.set(AccountCash::getStatus, AccountCashStatusEnum.SUCCESS.getCode())
.eq(AccountCash::getStatus, AccountCashStatusEnum.READY.getCode())
.in(AccountCash::getId,idList));
return R.ok();
public R<ExportBatchAuditVo> batchSuccess(String ids) {
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList());
ExportBatchAuditVo audit = accountCashService.batchAudit(idList);
return R.ok(audit);
}
}

7
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java
View File

@@ -3,11 +3,12 @@ package com.ruoyi.cai.controller.app;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.domain.VipOrder;
import com.ruoyi.cai.dto.ConsumeResp;
import com.ruoyi.cai.dto.app.query.GiveGiftRes;
import com.ruoyi.cai.dto.app.query.GiveGiftReq;
import com.ruoyi.cai.dto.app.query.GiveGuardReq;
import com.ruoyi.cai.dto.app.query.order.AddRechargeOrderDto;
import com.ruoyi.cai.dto.app.query.order.AddVipOrderDto;
import com.ruoyi.cai.dto.app.vo.order.OrderCreateVo;
import com.ruoyi.cai.dto.commom.consumer.GiftConsumerResp;
import com.ruoyi.cai.manager.ConsumerManager;
import com.ruoyi.cai.service.RechargeOrderService;
import com.ruoyi.cai.service.VipOrderService;
@@ -45,8 +46,8 @@ public class ConsumeController {
@PostMapping("/give/gift")
@Operation(summary = "赠送主播礼物")
@Log(title = "赠送主播礼物", businessType = BusinessType.OTHER, isSaveDb = true)
public R<Boolean> giveGift(@RequestBody GiveGiftRes query){
ConsumeResp resp = consumerManager.sendGift(query);
public R<Boolean> giveGift(@RequestBody GiveGiftReq query){
GiftConsumerResp resp = consumerManager.sendGift(query);
return R.ok(resp.isSuccess());
}

4
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.cai.controller.app;
import com.ruoyi.cai.dto.app.query.UserReportReq;
import com.ruoyi.cai.dto.app.query.push.PushErrorReq;
import com.ruoyi.cai.notice.YunxinHttpService;
import com.ruoyi.cai.service.ReportService;
import com.ruoyi.cai.service.UserErrorLogService;
import com.ruoyi.common.annotation.Log;
@@ -25,6 +26,8 @@ public class OtherController {
private ReportService reportService;
@Autowired
private UserErrorLogService userErrorLogService;
@Autowired
private YunxinHttpService yunxinHttpService;
@PostMapping("/report")
@Operation(summary = "举报")
@@ -33,6 +36,7 @@ public class OtherController {
Long userId = LoginHelper.getUserId();
reportRes.setUserId(userId);
reportService.report(reportRes);
yunxinHttpService.reportSendMessage(userId);
return R.ok();
}