From a6354b57ab2614b6211fbb89e24c5c8bec76ce86 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 五月 2023 10:23:44 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 966a7ee..506c1d4 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -13,6 +13,9 @@
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.dao.DriverMapper;
import com.supersavedriving.driver.modular.system.util.*;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.Register;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
import com.supersavedriving.driver.modular.system.warpper.*;
@@ -315,6 +318,7 @@
key = token.substring(token.length() - 16);
}
redisUtil.setStrValue(key, driver.getId().toString(), 7 * 24 * 60 * 60);//7天
+ redisUtil.setStrValue("DRIVER_" + phone, key, 7 * 24 * 60 * 60);//7天
return token;
}
return "";
@@ -548,9 +552,9 @@
driverInfo.setYouTuiEnd(youTuiDriver.getType() == 1 ? youTuiDriver.getFailureTime().getTime() : youTuiDriver.getEndTime().getTime());
}
List<Integer> state = Arrays.asList(107, 108, 109);
- int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT('%Y-%m-%d', createTime) = DATE_FORMAT('%Y-%m-%d', now())"));
+ int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT(createTime, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')"));
driverInfo.setTodayNum(count);
- count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT('%Y-%m', createTime) = DATE_FORMAT('%Y-%m', now())"));
+ count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state).last(" and DATE_FORMAT(createTime, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m')"));
driverInfo.setMonthNum(count);
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", uid).eq("status", 1));
driverInfo.setWork(null == driverWork ? 0 : 1);
@@ -841,4 +845,45 @@
this.updateById(driver);
return ResultUtil.success();
}
+
+
+ /**
+ * 开通小微商户
+ * @param name
+ * @param number
+ * @param phone
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil microenterprise(Integer uid, String name, String number, String phone) throws Exception {
+ Driver driver = this.selectById(uid);
+ Register registerVO = new Register();
+ registerVO.setMerUserId("driver_" + uid);
+ registerVO.setPhone(phone);
+ registerVO.setUserType("0");
+ registerVO.setUserName(name);
+ registerVO.setCertId(number);
+ registerVO.setNotifyUrl("");
+ TrhRequest<Register> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(registerVO, Register.SERVICE_CODE);
+ if(!"0000".equals(execute.getResult())){
+ return ResultUtil.error(execute.getMsg());
+ }
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");
+ if("2".equals(status)){
+ return ResultUtil.error("失败");
+ }
+ if("0".equals(status)){
+ return ResultUtil.error("处理中");
+ }
+ String userId = jsonObject.getString("userId");
+ driver.setMerchantNumber(userId);
+ driver.setMerchantIDCode(number);
+ driver.setMerchantName(name);
+ driver.setMerchantPhone(phone);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
}
--
Gitblit v1.7.1