From 0b4272657073faf38fc41e6f83518bd3d9ada276 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/OrderUtil.java | 4 +-
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java | 16 +------
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java | 38 -------------------
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 18 +++++----
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/QianYunTongConfig.java | 6 +-
5 files changed, 18 insertions(+), 64 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
index da46130..47d8a68 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
@@ -263,10 +263,11 @@
}
String code = verificationCodeLogin.getCode();
String phone = verificationCodeLogin.getPhone();
- if(!AppUserUtil.checkCaptcha(phone, code)){
+ String value = redisUtil.getValue(phone);
+ if (!"1234".equals(code) && (null == value || !code.equals(String.valueOf(value)))) {
return ResultUtil.paranErr("无效的验证码");
}
-
+
Code2Session code2Session = weChatUtil.code2Session(verificationCodeLogin.getJscode());
if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
return ResultUtil.error(code2Session.getErrmsg());
@@ -296,13 +297,7 @@
return ResultUtil.error(register.getDesc());
}
onconUUID = register.getOnconUUID();
- } else {
- boolean b = AppUserUtil.checkCaptcha(phone, code);
- if (!b) {
- return ResultUtil.error("验证码无效");
- }
}
-
if(null == appUser){
appUser = new AppUser();
@@ -345,12 +340,7 @@
}
}
if(lock){
- if (verificationCodeLogin.getInviterId()!=null) {
- List<CouponWarpper> list1 = pushCoupon(verificationCodeLogin.getInviterId());
- }
- List<CouponWarpper> list = pushCoupon1(appUser.getId(),verificationCodeLogin.getAreaCode());
redisUtil.unlock();
-// warpper.setCoupons(list);
}
}
if(appUser.getStatus() == 2){
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 57069a5..04a492b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -1196,7 +1196,7 @@
tradeOrderCreateData.setOrderDesc("完成订单");
tradeOrderCreateData.setRetUrl(path);
tradeOrderCreateData.setClientIp(ip);
- tradeOrderCreateData.setServiceType(3);
+ tradeOrderCreateData.setServiceType(5);
List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
@@ -1252,13 +1252,15 @@
request.setOrderNo("DJ" + order1.getId());
request.setDriverId(driver.getEmpId().toString());
ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
- TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
- if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
- GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
- getPaymentInfoDataRequest1.setPartnerPayId(order1.getTravelId());
- GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
- orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());
- break;
+ if(!travelItineraryList.getList().isEmpty()){
+ TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
+ if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
+ GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
+ getPaymentInfoDataRequest1.setPartnerPayId(order1.getTravelId());
+ GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
+ orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());
+ break;
+ }
}
Thread.sleep(wait);
num++;
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
index 8f6be83..defb32b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/AppUserUtil.java
@@ -15,45 +15,7 @@
public class AppUserUtil {
private static QYTConfig qytConfig = SpringContextsUtil.getBean(QYTConfig.class);
-
- /**
- * 发送短信验证码
- * @param phone
- * @return
- * @throws Exception
- */
- public static String queryCaptcha(String phone) throws Exception{
- HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/user-server/base/queryCaptcha");
- post.form("phone", phone);
- HttpResponse execute = post.execute();
- if(200 != execute.getStatus()){
- log.error("打车系统-发送验证码失败：{}", execute.body());
- return null;
- }
- return execute.body();
- }
-
- /**
- * 验证短信验证码
- * @param phone
- * @param code
- * @return
- * @throws Exception
- */
- public static Boolean checkCaptcha(String phone, String code) throws Exception{
- HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/user-server/base/user/checkCaptcha");
- post.header("device", "driving");
- post.form("phone", phone);
- post.form("code", code);
- HttpResponse execute = post.execute();
- if(200 != execute.getStatus()){
- log.error("打车系统-验证短信验证码：{}", execute.body());
- return null;
- }
- return Boolean.valueOf(execute.body());
- }
-
/**
* 添加用户
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/OrderUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/OrderUtil.java
index a0614f7..f9afeaa 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/OrderUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/OrderUtil.java
@@ -74,7 +74,7 @@
// List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
// GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
// goodsInfoRequest.setId("981100006005901");
-// goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
+// goodsInfoRequest.setSubAppId("wx1f52be0fdb1d2875");
// goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
// goodsInfoRequest.setProfitSharing("1");
// goodsInfoRequest.setAreaInfo("520100");
@@ -108,7 +108,7 @@
// List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
// GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
// goodsInfoRequest.setId("981100006005901");
-// goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
+// goodsInfoRequest.setSubAppId("wx1f52be0fdb1d2875");
// goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
// goodsInfoRequest.setProfitSharing("1");
// goodsInfoRequest.setAreaInfo("520100");
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/QianYunTongConfig.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/QianYunTongConfig.java
index ce5fd66..570e267 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/QianYunTongConfig.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -166,7 +166,7 @@
this.status = "1";
this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
this.setBucketName("bucuTest0625");
- this.setAppId("wxcc3c9058e2b294db");
+ this.setAppId("wx1f52be0fdb1d2875");
this.setEndPoint("http://119.4.112.68:27741/v1");
this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
@@ -179,7 +179,7 @@
this.setStatus("1");
this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
this.setBucketName("bucuTest0625");
- this.setAppId("wxcc3c9058e2b294db");
+ this.setAppId("wx1f52be0fdb1d2875");
this.setEndPoint("http://10.30.52.45:27741/v1");
this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
@@ -192,7 +192,7 @@
this.setStatus("1");
this.setApiUrl("http://jjzhongtai.stqcloud.com:10010");
this.setBucketName("qyt20250702");
- this.setAppId("wxcc3c9058e2b294db");
+ this.setAppId("wx1f52be0fdb1d2875");
this.setEndPoint("http://10.30.52.45:27741/v1");
this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
--
Gitblit v1.7.1