From 0d8b60c9ed72d996280688a82ffa8eac3afbbff9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 15:28:24 +0800
Subject: [PATCH] 新增加充值和提现功能
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
index e5ac4a8..c15dbd5 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
@@ -53,6 +53,9 @@
@Override
public ResultUtil driverWork(Integer driverId) throws Exception {
Driver driver = driverService.selectById(driverId);
+ if(ToolUtil.isEmpty(driver.getMerchantNumber())){
+ return ResultUtil.error("请先注册商户号");
+ }
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
Double num1 = JSON.parseObject(systemConfig.getContent()).getDouble("num1");
if(driver.getBalance() == null || driver.getBalance().compareTo(num1) < 0){
@@ -66,11 +69,11 @@
if(null != orderTransfer){
int i = Double.valueOf((System.currentTimeMillis() - orderTransfer.getSuccessTime().getTime()) / 60000).intValue();
if(num5 > i){
- return ResultUtil.error("暂时还无法上班，请稍后重试");
+ return ResultUtil.error("暂时还无法上班，请" + (num5 - i) + "分钟后重试");
}
}
- DriverWork driverWork = this.selectOne(new EntityWrapper<DriverWork>().eq("driverId", 1).eq("status", 1));
+ DriverWork driverWork = this.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driverId).eq("status", 1));
if(null != driverWork){
return ResultUtil.error("您正在上班中");
}
--
Gitblit v1.7.1