From b58aa9e68a30029423c57886a0a30896d833cb44 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 10 八月 2023 10:13:47 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 fb9e6ad..3bdb703 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.MallBook.model.*;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.*;
+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.BigInteger;
import java.math.RoundingMode;
@@ -162,6 +164,10 @@
}
driver.setCreateTime(new Date());
this.insert(driver);
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+
//司机邀请注册奖励
if(null != driver.getInviterId()){
@@ -190,6 +196,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
@@ -198,6 +214,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());
@@ -293,6 +310,11 @@
}
}
+ if(ToolUtil.isEmpty(driver.getReferralCode())){
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+ }
return ResultUtil.success(tokenWarpper);
}
@@ -561,13 +583,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