huliguo
2025-04-17 19df67e19f23cd2a04d1c7f355e1e656f4140af4
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopWithdrawController.java
@@ -79,7 +79,7 @@
     * 提现申请列表
     */
    @GetMapping("/list")
    @ApiOperation("提现申请列表")
    @ApiOperation(value = "提现申请列表" )
    public R<IPage<ShopWithdraw>> list(@ApiParam("页码") @RequestParam Integer pageNum,
                         @ApiParam("每一页数据大小") Integer pageSize,
                         ShopWithdraw shopWithdraw) {
@@ -120,10 +120,15 @@
                        .eq(auditStatus!=null,ShopWithdraw::getAuditStatus,auditStatus)
                        .orderByDesc(ShopWithdraw::getCreateTime)
                );
        page.getRecords().forEach(s->s.setIdStr(s.getId().toString()));
        //添加转账的银行卡号和账户姓名
        List<ShopWithdraw> records = page.getRecords();
        for (ShopWithdraw record : records) {
        }
        return R.ok(page);
    }
/*
    @GetMapping("/shop/info")
    @ApiOperation(value = "提现申请列表上方数据", notes = "提现申请列表", tags = {"门店后台"})
    public R<Shop> shopCommissionStatisticsinfo(){
@@ -155,6 +160,7 @@
        }
        return R.ok(byId);
    }
*/
    @GetMapping("/shop/with")
    @ApiOperation(value = "提现申请", notes = "提现申请列表", tags = {"门店后台"})
@@ -191,10 +197,19 @@
        }
        ShopWithdraw shopWithdraw = new ShopWithdraw();
        shopWithdraw.setShopId(shopId);
        shopWithdraw.setShopName(shop.getName());
        shopWithdraw.setCreateUserId(userId);
        shopWithdraw.setMoney(money);
        shopWithdraw.setAuditStatus(0);//待审核
        shopWithdraw.setStatus(1);//申请中
        shopWithdraw.setCreateTime(LocalDateTime.now());
        shopWithdraw.setTradeMerchantNo(shop.getTradeMerchantNo());
        shopWithdraw.setReceiverAccountNoEnc(shop.getReceiverAccountNoEnc());
        shopWithdraw.setReceiverNameEnc(shop.getReceiverNameEnc());
        shopWithdraw.setReceiverBankChannelNo(shop.getReceiverBankChannelNo());
        shopWithdraw.setReceiverAccountType(shop.getReceiverAccountType());
        shopWithdrawService.save(shopWithdraw);
        //扣除账户余额及添加变动明细
        BigDecimal balance = shop.getBalance();//余额