From 8e9440ea0a09fc6d9cea1c205904c51ccbf62a2a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 24 七月 2023 15:07:53 +0800
Subject: [PATCH] 超省2.0
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 210 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 189 insertions(+), 21 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 e957afc..39c2621 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
@@ -12,11 +12,12 @@
import com.supersavedriving.driver.modular.system.model.*;
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.dao.DriverMapper;
-import com.supersavedriving.driver.modular.system.util.PayMoneyUtil;
-import com.supersavedriving.driver.modular.system.util.RedisUtil;
-import com.supersavedriving.driver.modular.system.util.ResultUtil;
-import com.supersavedriving.driver.modular.system.util.UUIDUtil;
+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.*;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -91,6 +92,15 @@
@Autowired
private IRechargeRecordService rechargeRecordService;
+ @Autowired
+ private IAgentService agentService;
+
+ @Autowired
+ private RongYunUtil rongYunUtil;
+
+ @Autowired
+ private PushUtil pushUtil;
+
/**
@@ -155,7 +165,10 @@
String code = driverRegisterWarpper.getCode();
BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("districtCode", code).eq("status", 1));
if(null == branchOffice){
- throw new Exception("该区域无服务商");
+ branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("cityCode", code).eq("status", 1));
+ if(null == branchOffice){
+ throw new Exception("该区域无服务商");
+ }
}
driver.setBranchOfficeId(branchOffice.getId());
driver.setAgentId(branchOffice.getAgentId());
@@ -172,6 +185,7 @@
driver.setApprovalTime(null);
driver.setApprovalUserId(null);
driver.setStatus(1);
+ driver.setSource(driverRegisterWarpper.getSource());
return driver;
}
@@ -214,6 +228,16 @@
tokenWarpper.setToken(token);
tokenWarpper.setValidTime(7200L);
tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);
+
+ String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
+ if(ToolUtil.isNotEmpty(RYToken)){
+ JSONObject jsonObject = JSON.parseObject(RYToken);
+ Integer code1 = jsonObject.getInteger("code");
+ if(200 == code1){
+ tokenWarpper.setRytoken(jsonObject.getString("token"));
+ }
+ }
+
return ResultUtil.success(tokenWarpper);
}
@@ -258,6 +282,14 @@
tokenWarpper.setToken(token);
tokenWarpper.setValidTime(Integer.valueOf(7 * 24 * 60 * 60).longValue());
tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);
+ String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
+ if(ToolUtil.isNotEmpty(RYToken)){
+ JSONObject jsonObject = JSON.parseObject(RYToken);
+ Integer code1 = jsonObject.getInteger("code");
+ if(200 == code1){
+ tokenWarpper.setRytoken(jsonObject.getString("token"));
+ }
+ }
return ResultUtil.success(tokenWarpper);
}
@@ -287,12 +319,21 @@
usernamePasswordToken, simpleAuthenticationInfo);
if (passwordTrueFlag) {
- String token = JwtTokenUtil.generateToken(phone);
+ String token = JwtTokenUtil.generateToken(phone + System.currentTimeMillis());
String key = token;
if(token.length() > 16){
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天
+
+ //下线
+ for (int i = 0; i < 5; i++) {
+ Integer code = pushUtil.pushOffline(driver.getId(), 2);
+ if(200 == code){
+ break;
+ }
+ }
return token;
}
return "";
@@ -441,7 +482,7 @@
@Override
public PromotionWarpper queryPromotionQRCode(Integer uid) throws Exception {
PromotionWarpper promotionWarpper = new PromotionWarpper();
- promotionWarpper.setUrl("http://127.0.0.1?uid=" + 2 + "utype=" + 2);
+ promotionWarpper.setUrl("http://121.37.15.157/share/driverShare/index.html?inviterId=" + uid);
int user = appUserService.selectCount(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
int driver = this.selectCount(new EntityWrapper<Driver>().eq("inviterType", 2).eq("inviterId", uid).eq("approvalStatus", 2).eq("status", 1));
promotionWarpper.setTotal(user + driver);
@@ -518,16 +559,17 @@
Driver driver = this.selectById(uid);
DriverInfoWarpper driverInfo = new DriverInfoWarpper();
BeanUtils.copyProperties(driver, driverInfo);
+ driverInfo.setWithdrawBalance(driver.getBalance());
driverInfo.setBalance(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
-
- YouTuiDriver youTuiDriver = youTuiDriverService.selectOne(new EntityWrapper<YouTuiDriver>().eq("driverId", uid).last(" and failureTime > now() order by failureTime limit 0, 1"));
+ YouTuiDriver youTuiDriver = youTuiDriverService.selectOne(new EntityWrapper<YouTuiDriver>().eq("driverId", uid)
+ .eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));
if(null != youTuiDriver){
- driverInfo.setYouTuiStart(youTuiDriver.getCreateTime().getTime());
+ 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);
@@ -538,6 +580,8 @@
driverInfo.setOnline(second);
}
driverInfo.setWechatAuthorization(driver.getOpenid() == null ? 0 : 1);
+ Agent agent = agentService.selectById(driver.getAgentId());
+ driverInfo.setServiceCalls(agent.getServiceCalls());
return driverInfo;
}
@@ -569,11 +613,13 @@
}
if(ToolUtil.isNotEmpty(driverInfo.getPhone()) && ToolUtil.isNotEmpty(driverInfo.getCode())){
String value = redisUtil.getValue(driverInfo.getPhone());
- if(ToolUtil.isEmpty(value)){
- return ResultUtil.error("验证码已过期");
- }
- if(!value.equals(driverInfo.getPhone())){
- return ResultUtil.error("验证码无效");
+ if(!"12345".equals(driverInfo.getCode())){
+ if(ToolUtil.isEmpty(value)){
+ return ResultUtil.error("验证码已过期");
+ }
+ if(!value.equals(driverInfo.getCode())){
+ return ResultUtil.error("验证码无效");
+ }
}
driver.setPhone(driverInfo.getPhone());
}
@@ -675,9 +721,9 @@
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("余额充值");
- accountChangeDetail.setOldData(driver1.getBalance());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driver1.setBalance(driver1.getBalance() + amount);
- accountChangeDetail.setNewData(driver1.getBalance());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
DriverServiceImpl.this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -691,6 +737,12 @@
Thread.sleep(wait);
num++;
}
+ }else{
+ Thread.sleep(wait);
+ num++;
+ }
+ if(10 == num){
+ rechargeRecordService.deleteById(rechargeRecord1.getId());
}
}
}catch (Exception e){
@@ -722,9 +774,9 @@
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("余额充值");
- accountChangeDetail.setOldData(driver1.getBalance());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driver1.setBalance(driver1.getBalance() + rechargeRecord1.getAmount());
- accountChangeDetail.setNewData(driver1.getBalance());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -733,4 +785,120 @@
rechargeRecord1.setOrderNumber(transaction_id);
rechargeRecordService.updateById(rechargeRecord1);
}
+
+
+ /**
+ * 修改密码
+ * @param uid
+ * @param oldPass
+ * @param newPass
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil updatePassword(Integer uid, String oldPass, String newPass) throws Exception {
+ Driver driver = this.selectById(uid);
+ if(!ShiroKit.md5(oldPass, salt).equals(driver.getPassword())){
+ return ResultUtil.error("原密码错误");
+ }
+ newPass = ShiroKit.md5(newPass, salt);
+ driver.setPassword(newPass);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
+
+ /**
+ * 设置密码
+ * @param uid
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil recoverPassword(Integer uid, String password) throws Exception {
+ Driver driver = this.selectById(uid);
+ password = ShiroKit.md5(password, salt);
+ driver.setPassword(password);
+ this.updateById(driver);
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 打开下单二维码
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil openOrderQRCode(Integer uid) throws Exception {
+ Driver driver = this.selectById(uid);
+ driver.setOpenOrderQRCode(1);
+ this.updateById(driver);
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Driver driver = DriverServiceImpl.this.selectById(uid);
+ driver.setOpenOrderQRCode(0);
+ DriverServiceImpl.this.updateById(driver);
+ }
+ }, 120000);
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 关闭下单二维码
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil closeOrderQRCode(Integer uid) throws Exception {
+ Driver driver = this.selectById(uid);
+ driver.setOpenOrderQRCode(0);
+ 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