From 18301b754de23aa00f806b43c237f19750c25c59 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Fri, 6 Jun 2025 14:31:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/.env.development | 2 +- admin-hanhai-vue/.env.production | 2 +- .../src/views/cityMoneyLog/CityMoneyLogList.vue | 30 +++++++++--------- .../jeecg/modules/api/service/YaoDuApiService.java | 4 +++ .../api/service/impl/YaoDuApiServiceImpl.java | 37 ++++++++++++++++++++++ .../api/yaoduapi/YaoDuApiTokenController.java | 10 ++++++ .../src/main/resources/application-dev.yml | 2 +- 7 files changed, 69 insertions(+), 18 deletions(-) diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index 81e39b9..a7a7eb0 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8001/api/ +VUE_APP_API_BASE_URL=http://localhost:8081/api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index f7618ae..9e94d96 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8001/api/ +VUE_APP_API_BASE_URL=http://localhost:8081/api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue b/admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue index c3ad481..7c032c9 100644 --- a/admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue +++ b/admin-hanhai-vue/src/views/cityMoneyLog/CityMoneyLogList.vue @@ -88,22 +88,22 @@ - 编辑 + 提现审核 - - - 更多 - - - 详情 - - - - 删除 - - - - + + + + + + + + + + + + + + diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java index b814def..e1f4563 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java @@ -10,6 +10,7 @@ import org.jeecg.modules.cityCat.entity.CityCat; import org.jeecg.modules.cityComment.entity.CityComment; import org.jeecg.modules.cityHome.entity.CityHome; import org.jeecg.modules.cityJob.entity.CityJob; +import org.jeecg.modules.cityMoneyLog.entity.CityMoneyLog; import org.jeecg.modules.cityShopping.entity.CityShopping; import org.jeecg.modules.cityTrends.entity.CityTrends; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -210,6 +211,9 @@ public interface YaoDuApiService { Result getWalletFlow(String token,PageBean pageBean); + //提现 + Result withdraw(String token, CityMoneyLog bean); + //根据商品查询店铺商品 Result getGoodsList(String token,String shopId,PageBean pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java index 3c41a70..d49073e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java @@ -1559,6 +1559,43 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { } + //提现 + @Override + public Result withdraw(String token, CityMoneyLog bean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + if(bean.getPrice().compareTo(hanHaiMember.getPrice())>0){ + return Result.error("余额不足"); + } + //姓名不能为空 + if(StringUtils.isEmpty(bean.getName())){ + return Result.error("请填写姓名"); + } + //金额不能为空 + if(bean.getPrice().compareTo(new BigDecimal(0))<=0){ + return Result.error("请填写金额"); + } + //提现金额要为整数 + if(bean.getPrice().scale()>0){ + return Result.error("请填写整数金额"); + } + //提现金额要大于1 + if(bean.getPrice().compareTo(new BigDecimal(1))<=0){ + return Result.error("请填写大于1的整数金额"); + } + CityMoneyLog cityMoneyLog = new CityMoneyLog(); + cityMoneyLog.setUserId(hanHaiMember.getId()); + cityMoneyLog.setName(bean.getName()); + cityMoneyLog.setPrice(bean.getPrice()); + cityMoneyLog.setState(0); + cityMoneyLog.setType(0); + cityMoneyLog.setTitle("用户提现"); + cityMoneyLog.setCreateTime(new Date()); + cityMoneyLogService.save(cityMoneyLog); + hanHaiMember.setPrice(hanHaiMember.getPrice().subtract(bean.getPrice())); + hanHaiMemberService.updateById(hanHaiMember); + return Result.OK("提现成功,等待平台审核"); + } + @Override public Result getGoodsList(String token,String shopId,PageBean pageBean){ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java index 43805f4..7584feb 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java @@ -13,6 +13,7 @@ import org.jeecg.modules.cityCat.entity.CityCat; import org.jeecg.modules.cityComment.entity.CityComment; import org.jeecg.modules.cityHome.entity.CityHome; import org.jeecg.modules.cityJob.entity.CityJob; +import org.jeecg.modules.cityMoneyLog.entity.CityMoneyLog; import org.jeecg.modules.cityShopping.entity.CityShopping; import org.jeecg.modules.cityTrends.entity.CityTrends; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -262,6 +263,15 @@ public class YaoDuApiTokenController { } + + //提现 + @ApiOperation(value="提现") + @PostMapping("/withdraw") + public Result withdraw(@RequestHeader("X-Access-Token") String token, CityMoneyLog bean){ + return yaoDuApiService.withdraw(token,bean); + } + + //查询商品信息列表根据关联店铺标识 @ApiOperation(value="查询商品信息列表根据关联店铺标识") @GetMapping("/getGoodsList") diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index acf1602..7a58ab9 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8001 + port: 8081 tomcat: max-swallow-size: -1 error: