From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 cabe128..8994910 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
@@ -15,6 +15,7 @@
import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+import com.supersavedriving.driver.modular.system.util.huawei.OBSUtil;
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.util.weChat.WeChatUtil;
@@ -41,6 +42,7 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.InetAddress;
@@ -159,6 +161,10 @@
}
driver.setCreateTime(new Date());
this.insert(driver);
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+
//司机邀请注册奖励
if(null != driver.getInviterId()){
@@ -187,6 +193,16 @@
}
+
+ //生成小程序二维码
+ public String wechatMiniProgramORCode(Integer driverId) throws Exception{
+ InputStream release = weChatUtil.getwxacodeunlimit("pages/index/index", "driverId=" + driverId, "release");
+ String s = OBSUtil.putObjectToBucket(release, "driver_" + driverId + "_" + UUIDUtil.getNumberRandom(5) + ".jpg");
+ return s;
+ }
+
+
+
/**
* 组装个人信息
* @param driver
@@ -195,6 +211,7 @@
*/
public Driver setDriverParamete(Driver driver, DriverRegisterWarpper driverRegisterWarpper) throws Exception{
driver.setAvatar(driverRegisterWarpper.getAvatar());
+ driver.setName(driverRegisterWarpper.getName());
driver.setPhone(driverRegisterWarpper.getPhone());
driver.setEmergencyContact(driverRegisterWarpper.getEmergencyContact());
driver.setEmergencyPhone(driverRegisterWarpper.getEmergencyPhone());
@@ -287,6 +304,11 @@
}
}
+ if(ToolUtil.isEmpty(driver.getReferralCode())){
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+ }
return ResultUtil.success(tokenWarpper);
}
@@ -373,8 +395,8 @@
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天
+ redisUtil.setStrValue(key, driver.getId().toString(), 94608000);//7天
+ redisUtil.setStrValue("DRIVER_" + phone, key, 94608000);//7天
//下线
for (int i = 0; i < 5; i++) {
@@ -465,7 +487,7 @@
//找到中心点
GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(lon), Double.valueOf(lat));
//构造半径
- Distance distanceR = new Distance(5D, Metrics.KILOMETERS);
+ Distance distanceR = new Distance(10D, Metrics.KILOMETERS);
//画圆
Circle circle = new Circle(geoJsonPoint, distanceR);
// 构造query对象
@@ -537,13 +559,19 @@
@Override
public PromotionWarpper queryPromotionQRCode(Integer uid) throws Exception {
PromotionWarpper promotionWarpper = new PromotionWarpper();
- promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
+ Driver driver1 = this.selectById(uid);
+ if(ToolUtil.isEmpty(driver1.getReferralCode())){
+ String s = wechatMiniProgramORCode(driver1.getId());
+ driver1.setReferralCode(s);
+ this.updateById(driver1);
+ }
+// promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
+ promotionWarpper.setUrl(driver1.getReferralCode());
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);
promotionWarpper.setUser(user);
promotionWarpper.setDriver(driver);
- Driver driver1 = this.selectById(uid);
promotionWarpper.setAvatar(driver1.getAvatar());
promotionWarpper.setName(driver1.getName());
return promotionWarpper;
--
Gitblit v1.7.1