From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
index e6d1b79..c804805 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
@@ -6,17 +6,21 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopWithdraw;
+import com.ruoyi.other.dto.ShopBalanceDto;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.ShopWithdrawService;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -35,11 +39,13 @@
private ShopWithdrawService shopWithdrawService;
@Resource
private ShopService shopService;
+ @Resource
+ private TokenService tokenService;
/**
* 提现申请列表
*/
- @RequestMapping("/list")
+ @GetMapping("/list")
@ApiOperation("提现申请列表")
public R<IPage<ShopWithdraw>> list(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
@@ -51,6 +57,64 @@
return R.ok(page);
}
+ @GetMapping("/shop/list")
+ @ApiOperation(value = "提现申请列表", notes = "提现申请列表", tags = {"门店后台"})
+ public R<IPage<ShopWithdraw>> shoplist(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ ShopWithdraw shopWithdraw) {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Page<ShopWithdraw> page = shopWithdrawService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<ShopWithdraw>()
+ .eq(ShopWithdraw::getShopId,objectId)
+ .eq(shopWithdraw.getAuditStatus()!=null,ShopWithdraw::getAuditStatus,shopWithdraw.getAuditStatus())
+ .orderByDesc(ShopWithdraw::getCreateTime)
+ );
+ return R.ok(page);
+ }
+
+ @GetMapping("/shop/info")
+ @ApiOperation(value = "提现申请列表上方数据", notes = "提现申请列表", tags = {"门店后台"})
+ public R<Shop> shopCommissionStatisticsinfo(){
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Shop byId = shopService.getById(objectId);
+ return R.ok(byId);
+ }
+ @GetMapping("/shop/with")
+ @ApiOperation(value = "提现申请", notes = "提现申请列表", tags = {"门店后台"})
+ public R<Shop> shopwith(@RequestParam BigDecimal money){
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Shop byId = shopService.getById(objectId);
+ if (money.compareTo(byId.getCanWithdrawMoney())>0){
+ return R.fail("提现金额不能大于可提现金额");
+ }
+ ShopWithdraw shopWithdraw = new ShopWithdraw();
+ shopWithdraw.setShopId(objectId);
+ shopWithdraw.setMoney(money);
+ shopWithdraw.setAuditStatus(0);
+ shopWithdraw.setStatus(1);
+ shopWithdrawService.save(shopWithdraw);
+
+ return R.ok(byId);
+ }
+
+
+ /**
+ * 审核
+ */
+ @PostMapping("/audit")
+ @ApiOperation("审核")
+ public R<Void> audit(@RequestBody ShopWithdraw shopWithdraw) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ ShopWithdraw shopWithdraw1 = shopWithdrawService.getById(shopWithdraw.getId());
+ shopWithdraw1.setAuditStatus(shopWithdraw.getAuditStatus());
+ shopWithdraw1.setAuditUserId(loginUser.getUserid());
+ shopWithdraw1.setAuditTime(LocalDateTime.now());
+ shopWithdraw1.setAuditMsg(shopWithdraw.getAuditMsg());
+ shopWithdrawService.updateById(shopWithdraw1);
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.7.1