From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 3b42ed5..0e9dffc 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.config.properties.GunsProperties;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
@@ -24,7 +23,6 @@
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.WeChatUtil;
-import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig;
import com.stylefeng.guns.modular.system.util.zhenglian.CallbackUtil;
import com.stylefeng.guns.modular.system.util.zhenglian.TokenUtil;
import com.stylefeng.guns.modular.system.util.zhenglian.model.MessageBody;
@@ -51,6 +49,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.MessageFormat;
@@ -103,9 +102,6 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
-
- @Autowired
- private GunsProperties gunsProperties;
@Autowired
private ICompanyService companyService;
@@ -115,9 +111,6 @@
@Autowired
private TDriverPromotionActivityService driverPromotionActivityService;
-
- @Autowired
- private QianYunTongConfig qianYunTongConfig;
@Value("${wx.url}")
private String ACCESS_TOKEN_URL;
@@ -136,6 +129,12 @@
@Autowired
private WeChatUtil weChatUtil;
+
+ @Value("${filePath}")
+ private String filePath;
+
+ @Value("${qyt.admin_url}")
+ private String adminUrl;
/**
* 获取短信验证码
@@ -530,9 +529,11 @@
return ResultUtil.tokenErr();
}
Driver driver = driverService.selectById(uid);
- String areaCode = driver.getAreaCode();
+ String areaCode = driver.getPlaceOfEmployment();
TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>()
.eq("districtCode", areaCode)
+ .eq("state", 1)
+ .eq("remove", 0)
.eq("status", 2)
.last("LIMIT 1"));
if(tDriverPromotionActivity!=null){
@@ -559,19 +560,22 @@
}
Driver driver = driverService.selectById(uid);
String accessToken=null;
- Object img = redisTemplate.opsForValue().get("dache:DRIVER_WX_IMG" + uid);
+ Object img = redisTemplate.opsForValue().get("DRIVER_WX_IMG" + uid);
// 获取调用凭证accessToken
if(ToolUtil.isEmpty(driver.getShareLink())|| ToolUtil.isEmpty(img)){
accessToken = getAccessToken();
}
int index=0;
-
- if(ToolUtil.isEmpty(img)) {
+ String urlLink = driver.getShareLink();
+ if(ToolUtil.isEmpty(img) || ToolUtil.isEmpty(urlLink)) {
RestTemplate rest = new RestTemplate();
- String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+// String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+ String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
Map<String, Object> param = new HashMap<>();
- param.put("path", "pages/home/home?driverId=" + uid);
+ param.put("page", "pages/home/home");
param.put("width", 430); //二维码尺寸
+ param.put("scene", "driverId=" + uid);
+ param.put("env_version", "release"); //正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
HttpRequest post = HttpUtil.createPost(url);
post.body(JSON.toJSONString(param));
@@ -581,7 +585,6 @@
redisTemplate.opsForValue().set("DRIVER_WX_IMG" + uid, img,30, TimeUnit.DAYS);
}
- String urlLink = driver.getShareLink();
if(ToolUtil.isEmpty(urlLink)) {
index=1;
String url1 = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + accessToken;
@@ -1768,15 +1771,17 @@
//HttpURLConnection httpURLConnection = weChatUtil.getwxacodeunlimit(appletPath, "d=" + driverId + "&k=" + 0, "release",driverId);
InputStream inputStream = weChatUtil.getwxacodeunlimit(appletPath, "driverId=" + driverId, "release");
if (inputStream != null) {
- // 上传文件目录
- fileName = UUID.randomUUID().toString() + ".png";
- String fileSavePath = gunsProperties.getFileUploadPath() + "img\\";
- FileUtil.writeFromStream(inputStream, fileName);
- String pictureName = gunsProperties.getPictureServerAddress() + "img/" + fileName;
-// fileName = OssUploadUtil.ossUploadByStream(driverId, inputStream);
- System.out.println(pictureName);
- driver.setQrCode(pictureName);
+ File file = FileUtil.writeFromStream(inputStream, new File(filePath + "/" + UUID.randomUUID().toString() + ".png"));
+ HttpRequest post = HttpUtil.createPost(adminUrl + "/upload/image");
+ post.form("file", file);
+ HttpResponse execute = post.execute();
+ int status = execute.getStatus();
+ if(200 != status){
+ throw new RuntimeException("上传图片异常");
+ }
+ driver.setQrCode(execute.body());
driverService.updateById(driver);
+ fileName = driver.getQrCode();
}
}
return ResultUtil.success(fileName);
--
Gitblit v1.7.1