From 52a40b6db35456112d8a470fc0e7f68207be6bfe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 14:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 2
DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml | 2
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java | 4
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 5
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java | 6
UserQYTTravel/guns-admin/src/main/resources/application.yml | 1
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 29 ++++
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java | 2
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java | 1
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 254 ++++++++++++++++++++++++-----------------
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java | 12 ++
MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java | 2
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java | 2
13 files changed, 201 insertions(+), 121 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 57f5b56..a459b45 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -440,7 +440,7 @@
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额,4=云闪付）", name = "payType", required = false, dataType = "int"),
- @ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "改派原因", name = "reason", required = false, dataType = "string"),
@ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -459,6 +459,33 @@
}
}
+ @ResponseBody
+ @PostMapping("/api/order/reassignCancel")
+ @ApiOperation(value = "提交改派申请--取消", tags = {"司机端-服务中"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额,4=云闪付）", name = "payType", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "改派原因", name = "reason", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil reassignCancel(Reassign reassign, HttpServletRequest request){
+ try {
+ Integer uid = driverService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return reassignService.saveDataCancel(reassign, uid, null);
+ }catch (SystemException s){
+ return ResultUtil.error(s.getMsg());
+ } catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
/**
* 司机走流程操作
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
index 0015498..51e63f4 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
@@ -17,6 +17,7 @@
* @throws Exception
*/
ResultUtil saveData(Reassign reassign, Integer uid, Integer type) throws Exception;
+ ResultUtil saveDataCancel(Reassign reassign, Integer uid, Integer type) throws Exception;
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index 576d920..d926cbf 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -66,7 +66,7 @@
// driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
for (Map<String, Object> stringObjectMap : list) {
// 1使用中 2空闲中
- if(stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
+ if(stringObjectMap.get("useDriverId")!=null && stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
map.put("useState", 1);
}else {
map.put("useState", 0);
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index a880df4..b004709 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -401,8 +401,9 @@
driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
+
driver.setArea(registeredWarpper.getArea());
- driver.setAreaCode(registeredWarpper.getAreaCode());
+ driver.setAreaCode(registeredWarpper.getPlaceOfEmployment());
driver.setCity(registeredWarpper.getCity());
driver.setCityCode(registeredWarpper.getCityCode());
driver.setProvince(registeredWarpper.getProvince());
@@ -412,7 +413,7 @@
return ResultUtil.error("请选择服务商");
}
- String code = registeredWarpper.getAreaCode();
+ String code = registeredWarpper.getPlaceOfEmployment();
Company query = companyCityService.query(code);
if(null == query){
return ResultUtil.error("选择从业地暂未开通业务");
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index cd3f3ad..d3625af 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -102,7 +102,6 @@
private String callbackPath;
-
/**
* 提交改派申请
* @param uid 申请司机id
@@ -113,9 +112,9 @@
public ResultUtil saveData(Reassign reassign, Integer uid, Integer type) throws Exception {
type = null == type ? 2 : type;//现目前微信只支持小程序支付
String content = reassign.getRemark();
- if(ToolUtil.isNotEmpty(content)){
+ if (ToolUtil.isNotEmpty(content)) {
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- for(SensitiveWords s : sensitiveWords){
+ for (SensitiveWords s : sensitiveWords) {
content = content.replaceAll(s.getContent(), "***");
}
}
@@ -128,12 +127,12 @@
// return ResultUtil.error("有未完成支付的改派申请");
// }
Reassign query = reassignMapper.query(uid, null, reassign.getOrderId(), reassign.getOrderType(), 1);
- if(null != query){
+ if (null != query) {
// return ResultUtil.error("不能重复提交申请");
reassignMapper.deleteById(query.getId());
}
query = reassignMapper.query(uid, null, reassign.getOrderId(), reassign.getOrderType(), 2);
- if(null != query){
+ if (null != query) {
return ResultUtil.error("您提交的申请正在处理中");
}
@@ -148,19 +147,19 @@
systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);
//开始支付
- if(null != reassign.getPayType()){
- if(reassign.getPayType() == 1){//微信支付
+ if (null != reassign.getPayType()) {
+ if (reassign.getPayType() == 1) {//微信支付
reassign.setState(1);
resultUtil = payMoneyUtil.weixinpay("改派订单", "", reassign.getId() + "_" + reassign.getOrderType() + "_" + UUIDUtil.getRandomCode(5), aDouble.toString(), "/base/wxReassign", "APP", "");
paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 1, aDouble, "", 1);//添加预支付数据
}
- if(reassign.getPayType() == 2){//支付宝
+ if (reassign.getPayType() == 2) {//支付宝
reassign.setState(1);
resultUtil = payMoneyUtil.alipay("改派订单", "改派订单", "", reassign.getId() + "_" + reassign.getOrderType() + "_" + UUIDUtil.getRandomCode(5), aDouble.toString(), "/base/aliReassign");
paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 2, aDouble, "", 1);//添加预支付数据
}
- if(reassign.getPayType() == 3){//余额
+ if (reassign.getPayType() == 3) {//余额
reassign.setState(2);
reassign.setPayTime(new Date());
reassignMapper.updateById(reassign);
@@ -183,32 +182,32 @@
//修改改派通知状态
- switch (reassign.getOrderType()){
+ switch (reassign.getOrderType()) {
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId());
orderPrivateCar.setOldState(orderPrivateCar.getState());
orderPrivateCar.setState(11);
orderPrivateCar.setReassignNotice(2);
orderPrivateCarService.updateById(orderPrivateCar);
-
+
Company company = companyService.selectById(driver.getCompanyId());
//中台修改订单状态
ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
request.setOrderId(orderPrivateCar.getTravelId());
request.setStatus(orderPrivateCar.getState());
request.setDriverId(driver.getEmpId().toString());
- if(2 == orderPrivateCar.getPromotion()){
+ if (2 == orderPrivateCar.getPromotion()) {
Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
request.setPromoterId(driver1.getEmpId().toString());
}
request.setSupplierShopId(company.getEnterCode());
OrderUtil.modifyTravelItinerary(request);
-
+
//添加已收入明细
// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
// qyt 改派直接推送
- pushOrderPrivate(orderPrivateCar,uid);
+ pushOrderPrivate(orderPrivateCar, uid);
break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
@@ -216,25 +215,25 @@
orderTaxi.setState(11);
orderTaxi.setReassignNotice(2);
orderTaxiService.updateById(orderTaxi);
-
+
Company company1 = companyService.selectById(driver.getCompanyId());
//中台修改订单状态
ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
request1.setOrderId(orderTaxi.getTravelId());
request1.setStatus(orderTaxi.getState());
request1.setDriverId(driver.getEmpId().toString());
- if(2 == orderTaxi.getPromotion()){
+ if (2 == orderTaxi.getPromotion()) {
Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId());
request1.setPromoterId(driver1.getEmpId().toString());
}
request1.setSupplierShopId(company1.getEnterCode());
OrderUtil.modifyTravelItinerary(request1);
-
+
//添加已收入明细
// incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());
// qyt 改派直接推送
- pushOrderTaxi(orderTaxi,uid);
+ pushOrderTaxi(orderTaxi, uid);
break;
case 4:
OrderLogistics orderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
@@ -269,24 +268,68 @@
// }
-
-
}
- if(reassign.getPayType() == 4){
+ if (reassign.getPayType() == 4) {
// TODO 司机云闪付 改派调起云闪付
Double payMoney = reassign.getMoney();
paymentRecordService.saveData(1, uid, 2, reassign.getOrderId(), reassign.getOrderType(), 4, aDouble, "", 1);//添加预支付数据
- resultUtil = placeAnOrder(new BigDecimal(payMoney), 4,1,reassign.getId());
+ resultUtil = placeAnOrder(new BigDecimal(payMoney), 4, 1, reassign.getId());
}
}
return resultUtil;
}
+ @Override
+ public ResultUtil saveDataCancel(Reassign reassign, Integer uid, Integer type) throws Exception {
+ Driver driver = driverService.selectById(uid);
+ //修改改派通知状态
+ switch (reassign.getOrderType()) {
+ case 1:
+ OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId());
+ orderPrivateCar.setState(orderPrivateCar.getOldState());
+ orderPrivateCar.setReassignNotice(0);
+ orderPrivateCarService.updateById(orderPrivateCar);
- private ResultUtil placeAnOrder(BigDecimal amount, Integer type,Integer orderType,Integer reassignId) throws Exception {
+ Company company = companyService.selectById(driver.getCompanyId());
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
+ request.setOrderId(orderPrivateCar.getTravelId());
+ request.setStatus(orderPrivateCar.getState());
+ request.setDriverId(driver.getEmpId().toString());
+ if (2 == orderPrivateCar.getPromotion()) {
+ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ request.setSupplierShopId(company.getEnterCode());
+ OrderUtil.modifyTravelItinerary(request);
+ break;
+ case 2:
+ OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
+ orderTaxi.setState(orderTaxi.getOldState());
+ orderTaxi.setReassignNotice(0);
+ orderTaxiService.updateById(orderTaxi);
+ Company company1 = companyService.selectById(driver.getCompanyId());
+ //中台修改订单状态
+ ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
+ request1.setOrderId(orderTaxi.getTravelId());
+ request1.setStatus(orderTaxi.getState());
+ request1.setDriverId(driver.getEmpId().toString());
+ if (2 == orderTaxi.getPromotion()) {
+ Driver driver1 = driverService.selectById(orderTaxi.getPromotionDriverId());
+ request1.setPromoterId(driver1.getEmpId().toString());
+ }
+ request1.setSupplierShopId(company1.getEnterCode());
+ OrderUtil.modifyTravelItinerary(request1);
+ break;
+ }
+ return ResultUtil.success();
+ }
+
+
+ private ResultUtil placeAnOrder(BigDecimal amount, Integer type, Integer orderType, Integer reassignId) throws Exception {
Reassign reassign = reassignMapper.selectById(reassignId);
String merOrderId = Util.getMerOrderId(qrCodeConfiguration.getMsgSrcId());
- reassign.setBillNo(merOrderId+"0");
+ reassign.setBillNo(merOrderId + "0");
reassignMapper.updateById(reassign);
JSONObject json = new JSONObject();
json.put("requestTimestamp", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); // 报文请求时间
@@ -296,7 +339,7 @@
json.put("instMid", qrCodeConfiguration.getInstMid()); // 业务类型
json.put("totalAmount", amount.multiply(new BigDecimal("100")).intValue()); // 支付总金额
json.put("orderDesc", "APP下单"); // 订单描述
- json.put("srcReserve", reassignId+"_"+orderType+"_"+UUIDUtil.getRandomCode(5) + "-" +orderType+"-"+type); // 预留字段
+ json.put("srcReserve", reassignId + "_" + orderType + "_" + UUIDUtil.getRandomCode(5) + "-" + orderType + "-" + type); // 预留字段
json.put("subAppId", "wxasdasdasdasdads");
json.put("notifyUrl", "https://zhentonggongsi.com:443/driver/api/placeOrder/notifyUrl");
json.put("tradeType", "APP"); // 交易类型，微信必传
@@ -311,18 +354,18 @@
System.err.println("请求报文json:\n" + json);
String url;
- if(1 == type){
+ if (1 == type) {
// url = "https://test-api-open.chinaums.com/v1/netpay/wx/app-pre-order";// 测试
url = "https://api-mop.chinaums.com/v1/netpay/wx/app-pre-order";
- }else if (2 == type){
+ } else if (2 == type) {
// url = "https://test-api-open.chinaums.com/v1/netpay/trade/precreate";// 测试
url = "https://api-mop.chinaums.com/v1/netpay/trade/precreate";
- }else {
+ } else {
// url = "https://test-api-open.chinaums.com/v1/netpay/uac/app-order";// 测试
url = "https://api-mop.chinaums.com/v1/netpay/uac/app-order";
}
//OPEN-BODY-SIG 方式
- String result = GetOpenBodySig.sendOpenBodySig(qrCodeConfiguration.getAppId(),qrCodeConfiguration.getAppKey(),url, json.toString());
+ String result = GetOpenBodySig.sendOpenBodySig(qrCodeConfiguration.getAppId(), qrCodeConfiguration.getAppKey(), url, json.toString());
System.err.println("响应报文json:\n" + result);
JSONObject jsonObject = JSONObject.parseObject(result);
Object appPayRequest = jsonObject.get("appPayRequest");
@@ -339,10 +382,10 @@
* @return
* @throws Exception
*/
- private ResultUtil placeAnOrder1(BigDecimal amount, Integer type,Integer orderType,Integer reassignId) throws Exception {
+ private ResultUtil placeAnOrder1(BigDecimal amount, Integer type, Integer orderType, Integer reassignId) throws Exception {
Reassign reassign = reassignMapper.selectById(reassignId);
String merOrderId = Util.getMerOrderId(qrCodeConfiguration.getMsgSrcId());
- reassign.setBillNo(merOrderId+"0");
+ reassign.setBillNo(merOrderId + "0");
reassignMapper.updateById(reassign);
JSONObject json = new JSONObject();
json.put("requestTimestamp", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); // 报文请求时间
@@ -352,7 +395,7 @@
json.put("instMid", qrCodeConfiguration.getInstMid()); // 业务类型
json.put("totalAmount", amount.multiply(new BigDecimal("100")).intValue()); // 支付总金额
json.put("orderDesc", "APP下单"); // 订单描述
- json.put("srcReserve", reassignId+"_"+orderType+"_"+UUIDUtil.getRandomCode(5) + "-" +1+"-"+type); // 预留字段
+ json.put("srcReserve", reassignId + "_" + orderType + "_" + UUIDUtil.getRandomCode(5) + "-" + 1 + "-" + type); // 预留字段
json.put("subAppId", "wxasdasdasdasdads");
json.put("notifyUrl", "https://zhentonggongsi.com:443/driver/api/placeOrder/notifyUrl");
json.put("tradeType", "APP"); // 交易类型，微信必传
@@ -367,18 +410,18 @@
System.err.println("请求报文json:\n" + json);
String url;
- if(1 == type){
+ if (1 == type) {
// url = "https://test-api-open.chinaums.com/v1/netpay/wx/app-pre-order";// 测试
url = "https://api-mop.chinaums.com/v1/netpay/wx/app-pre-order";
- }else if (2 == type){
+ } else if (2 == type) {
// url = "https://test-api-open.chinaums.com/v1/netpay/trade/precreate";// 测试
url = "https://api-mop.chinaums.com/v1/netpay/trade/precreate";
- }else {
+ } else {
// url = "https://test-api-open.chinaums.com/v1/netpay/uac/app-order";// 测试
url = "https://api-mop.chinaums.com/v1/netpay/uac/app-order";
}
//OPEN-BODY-SIG 方式
- String result = GetOpenBodySig.sendOpenBodySig(qrCodeConfiguration.getAppId(),qrCodeConfiguration.getAppKey(),url, json.toString());
+ String result = GetOpenBodySig.sendOpenBodySig(qrCodeConfiguration.getAppId(), qrCodeConfiguration.getAppKey(), url, json.toString());
System.err.println("响应报文json:\n" + result);
JSONObject jsonObject = JSONObject.parseObject(result);
Object appPayRequest = jsonObject.get("appPayRequest");
@@ -397,9 +440,9 @@
public ResultUtil saveData_(Reassign reassign, String orderIds, Integer uid, Integer type) throws Exception {
type = null == type ? 2 : type;//现目前微信只支持小程序支付
String content = reassign.getRemark();
- if(ToolUtil.isNotEmpty(content)){
+ if (ToolUtil.isNotEmpty(content)) {
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- for(SensitiveWords s : sensitiveWords){
+ for (SensitiveWords s : sensitiveWords) {
content = content.replaceAll(s.getContent(), "***");
}
}
@@ -415,14 +458,14 @@
Double aDouble = orderService.queryReassignMoney(Integer.valueOf(split[0]), 3);
Double totalMoney = aDouble * split.length;
String ids = "";
- for(String id : split){
+ for (String id : split) {
Reassign query = reassignMapper.query(uid, null, Integer.valueOf(id), 3, 1);
- if(null != query){
+ if (null != query) {
// return ResultUtil.error("不能重复提交申请");
reassignMapper.deleteById(query.getId());
}
query = reassignMapper.query(uid, null, Integer.valueOf(id), 3, 2);
- if(null != query){
+ if (null != query) {
return ResultUtil.error("您提交的申请正在处理中");
}
@@ -440,24 +483,24 @@
systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);
//开始支付
- if(null != reassign.getPayType()){
- if(reassign.getPayType() == 1){//微信支付
+ if (null != reassign.getPayType()) {
+ if (reassign.getPayType() == 1) {//微信支付
String[] split1 = ids.split(",");
resultUtil = payMoneyUtil.weixinpay("改派订单", "", ids + "_3_" + UUIDUtil.getRandomCode(5), totalMoney.toString(), "/base/wxReassign", "APP", "");
- for(String id : split1){
+ for (String id : split1) {
paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 1, aDouble, "", 1);//添加预支付数据
}
}
- if(reassign.getPayType() == 2){//支付宝
+ if (reassign.getPayType() == 2) {//支付宝
String[] split1 = ids.split(",");
resultUtil = payMoneyUtil.alipay("改派订单", "改派订单", "", ids + "_3_" + UUIDUtil.getRandomCode(5), totalMoney.toString(), "/base/aliReassign");
- for(String id : split1){
+ for (String id : split1) {
paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 2, aDouble, "", 1);//添加预支付数据
}
}
- if(reassign.getPayType() == 3){//余额
- for(String id : split){
+ if (reassign.getPayType() == 3) {//余额
+ for (String id : split) {
Reassign query = reassignMapper.query(uid, null, Integer.valueOf(id), 3, 1);
query.setState(2);
query.setPayTime(new Date());
@@ -468,12 +511,12 @@
Double balance = driver.getBalance();
Double laveBusinessMoney = driver.getLaveBusinessMoney();
Double laveActivityMoney = driver.getLaveActivityMoney();
- if(null == balance || balance < totalMoney){
+ if (null == balance || balance < totalMoney) {
throw new SystemException("账户余额不足");
}
- if(null != laveBusinessMoney && laveBusinessMoney.compareTo(totalMoney) >= 0){
+ if (null != laveBusinessMoney && laveBusinessMoney.compareTo(totalMoney) >= 0) {
driver.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(new BigDecimal(totalMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }else if(null != laveActivityMoney && laveActivityMoney.compareTo(totalMoney) >= 0){
+ } else if (null != laveActivityMoney && laveActivityMoney.compareTo(totalMoney) >= 0) {
driver.setLaveActivityMoney(new BigDecimal(laveActivityMoney).subtract(new BigDecimal(totalMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
}
driver.setBalance(new BigDecimal(balance).subtract(new BigDecimal(totalMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -481,7 +524,7 @@
//修改改派通知状态
- for(String id : split){
+ for (String id : split) {
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(id);
orderCrossCity.setOldState(orderCrossCity.getState());
orderCrossCity.setState(11);
@@ -497,15 +540,15 @@
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+ for (Dispatch dispatch : dispatches) {
+ jgPushUtil.push(2, "有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
}
}
- if(reassign.getPayType() == 4){
+ if (reassign.getPayType() == 4) {
String[] split1 = ids.split(",");
- resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4,3,Integer.valueOf(split1[0]));
- for(String id : split1){
+ resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0]));
+ for (String id : split1) {
// TODO 司机云闪付 跨城改派调起云闪付
paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据
}
@@ -513,8 +556,6 @@
}
return resultUtil;
}
-
-
/**
@@ -530,7 +571,6 @@
pageNum = (pageNum - 1) * size;
return reassignMapper.queryList(uid, pageNum, size);
}
-
public static List<Integer> orderIds = new ArrayList<>();
@@ -550,19 +590,19 @@
public void payReassign(String id, String order_id, Integer type) throws Exception {
System.out.println("改派支付完成后的操作");
String[] s = id.split("_");
- if(Integer.valueOf(s[1]) == 3){//跨城订单
+ if (Integer.valueOf(s[1]) == 3) {//跨城订单
System.out.println("跨城订单");
String[] split = s[0].split(",");
List<Reassign> reassigns = this.selectBatchIds(Arrays.asList(split));
Driver driver = driverService.selectById(reassigns.get(0).getOriginalDriverId());
- for(String key : split){
+ for (String key : split) {
PaymentRecord query = paymentRecordService.query(1, driver.getId(), 2, Integer.valueOf(key), 3, type, 1);
- if(null != query){
+ if (null != query) {
System.out.println("跨城订单开始");
//添加交易明细
transactionDetailsService.saveData(reassigns.get(0).getOriginalDriverId(), "司机改派支付", reassigns.get(0).getMoney(), 2, 1, 2, 3, Integer.valueOf(key));
System.out.println("==============添加交易明细完毕===================");
- for(Reassign reassign : reassigns){
+ for (Reassign reassign : reassigns) {
reassign.setState(2);
reassign.setPayOrder(order_id);
reassign.setPayTime(new Date());
@@ -572,47 +612,46 @@
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+ for (Dispatch dispatch : dispatches) {
+ jgPushUtil.push(2, "有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
}
}
query.setState(2);
query.setCode(order_id);
paymentRecordService.updateById(query);
- System.out.println("==============paymentRecord完毕==================="+query);
+ System.out.println("==============paymentRecord完毕===================" + query);
//修改改派通知状态
- for(Reassign reassign : reassigns){
+ for (Reassign reassign : reassigns) {
OrderCrossCity orderCrossCity1 = orderCrossCityService.selectById(reassign.getOrderId());
orderCrossCity1.setOldState(orderCrossCity1.getState());
orderCrossCity1.setState(11);
orderCrossCity1.setReassignNotice(2);
orderCrossCityService.updateById(orderCrossCity1);
- System.out.println("==============跨城修改改派通知状态完毕==================="+orderCrossCity1);
+ System.out.println("==============跨城修改改派通知状态完毕===================" + orderCrossCity1);
//添加已收入明细
incomeService.saveData(1, orderCrossCity1.getCompanyId(), 4, orderCrossCity1.getId(), 3, reassign.getMoney());
}
- systemNoticeService.addSystemNotice(2, "您已使用" + (type == 1 ? "微信" : (type == 2?"支付宝":"云闪付")) + "成功支付改派申请费用！", reassigns.get(0).getOriginalDriverId(), 1);
+ systemNoticeService.addSystemNotice(2, "您已使用" + (type == 1 ? "微信" : (type == 2 ? "支付宝" : "云闪付")) + "成功支付改派申请费用！", reassigns.get(0).getOriginalDriverId(), 1);
System.out.println("==============跨城修改改派通知状态完毕===================");
// qyt 新增改派 重新推送
-
- }else{
- System.err.println("预支付数据异常（orderId = " + id + ")");
+ } else {
+ System.err.println("预支付数据异常（orderId = " + id + ")");
}
}
- }else{//其他订单
+ } else {//其他订单
System.out.println("其他订单");
Reassign reassign = this.selectById(s[0]);
Driver driver = driverService.selectById(reassign.getOriginalDriverId());
PaymentRecord query = paymentRecordService.query(1, driver.getId(), 2, reassign.getOrderId(), reassign.getOrderType(), type, 1);
- System.out.println("==============paymentRecord查询==================="+query);
- if(null != query){
+ System.out.println("==============paymentRecord查询===================" + query);
+ if (null != query) {
//添加交易明细
transactionDetailsService.saveData(reassign.getOriginalDriverId(), "司机改派支付", reassign.getMoney(), 2, 1, 2, reassign.getOrderType(), reassign.getOrderId());
reassign.setState(2);
@@ -623,10 +662,10 @@
query.setState(2);
query.setCode(order_id);
paymentRecordService.updateById(query);
- System.out.println("==============paymentRecord完毕==================="+query);
+ System.out.println("==============paymentRecord完毕===================" + query);
//修改改派通知状态
- switch (reassign.getOrderType()){
+ switch (reassign.getOrderType()) {
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId());
orderPrivateCar.setOldState(orderPrivateCar.getState());
@@ -636,7 +675,7 @@
//添加已收入明细
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
- System.out.println("==============快车完毕==================="+orderPrivateCar);
+ System.out.println("==============快车完毕===================" + orderPrivateCar);
break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(reassign.getOrderId());
@@ -647,7 +686,7 @@
//添加已收入明细
incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());
- System.out.println("==============出租车完毕==================="+orderTaxi);
+ System.out.println("==============出租车完毕===================" + orderTaxi);
break;
case 4:
OrderLogistics orderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
@@ -658,7 +697,7 @@
//添加已收入明细
incomeService.saveData(1, orderLogistics.getCompanyId(), 4, orderLogistics.getId(), 4, reassign.getMoney());
- System.out.println("==============物流订单完毕1==================="+orderLogistics);
+ System.out.println("==============物流订单完毕1===================" + orderLogistics);
break;
case 5:
OrderLogistics orderLogistics1 = orderLogisticsService.selectById(reassign.getOrderId());
@@ -669,32 +708,33 @@
//添加已收入明细
incomeService.saveData(1, orderLogistics1.getCompanyId(), 4, orderLogistics1.getId(), 5, reassign.getMoney());
- System.out.println("==============物流订单完毕2==================="+orderLogistics1);
+ System.out.println("==============物流订单完毕2===================" + orderLogistics1);
break;
}
- systemNoticeService.addSystemNotice(2, "您已使用" + (type == 1 ? "微信" :(type == 2?"支付宝":"云闪付") ) + "成功支付改派申请费用！", reassign.getOriginalDriverId(), 1);
+ systemNoticeService.addSystemNotice(2, "您已使用" + (type == 1 ? "微信" : (type == 2 ? "支付宝" : "云闪付")) + "成功支付改派申请费用！", reassign.getOriginalDriverId(), 1);
//开始推送调度单
Map<String, String> map = new HashMap<>();
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+ for (Dispatch dispatch : dispatches) {
+ jgPushUtil.push(2, "有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
}
System.out.println("==============其他订单完毕===================");
- }else{
- System.err.println("预支付数据异常（orderId = " + id + ")");
+ } else {
+ System.err.println("预支付数据异常（orderId = " + id + ")");
}
}
}
+
@Autowired
private ICompanyCityService companyCityService;
@Autowired
private IPushOrderService pushOrderService;
-
+
@Autowired
private IOpenCityService openCityService;
@@ -706,7 +746,7 @@
* @param orderTaxi
* @throws Exception
*/
- public void pushOrderTaxi(OrderTaxi orderTaxi, Integer uid) throws Exception{
+ public void pushOrderTaxi(OrderTaxi orderTaxi, Integer uid) throws Exception {
new Thread(new Runnable() {
@Override
public void run() {
@@ -719,13 +759,14 @@
}
OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
List<PushOrder> querys = pushOrderService.querys(null, 2, openCity.getId());//获取需要推送的次数
- for (int i = 1; i <=6; i++) {
+ for (int i = 1; i <= 6; i++) {
int finalI = i;
PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
System.out.println("pushOrder:" + pushOrder);
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(2, orderTaxi.getStartLon(), orderTaxi.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
- list = list.stream().filter(e->e.getId()!=uid).collect(Collectors.toList());
+ list = list.stream().filter(e -> e.getId() != uid).collect(Collectors.toList());
+ OrderTaxi orderTaxi1 = orderTaxiService.selectById(orderTaxi.getId());
if (list.size() > 0) {
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
@@ -747,12 +788,11 @@
}
}
Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
- OrderTaxi orderTaxi1 = orderTaxiService.selectById(orderTaxi.getId());
Integer state = orderTaxi1.getState();
- if (state != 1) {
+ if (state != 1 || state!= 11) {
break;
}
- if (i == 6 && state == 1) {
+ if (i == 6 && (state == 1 || state==11)) {
pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
orderTaxi1.setState(10);
orderTaxiService.updateById(orderTaxi1);
@@ -772,40 +812,40 @@
* @param orderPrivateCar
* @throws Exception
*/
- public void pushOrderPrivate(OrderPrivateCar orderPrivateCar,Integer uid) throws Exception{
+ public void pushOrderPrivate(OrderPrivateCar orderPrivateCar, Integer uid) throws Exception {
new Thread(new Runnable() {
@Override
public void run() {
try {
Integer id = orderPrivateCar.getId();
- Integer orderType = orderPrivateCar.getRideType()==1?1:orderPrivateCar.getRideType()==2?9:8;
+ Integer orderType = orderPrivateCar.getRideType() == 1 ? 1 : orderPrivateCar.getRideType() == 2 ? 9 : 8;
orderIds.add(orderPrivateCar.getId());//添加记录，防止调用接口重复提醒无人接单
String vehicle = (String) redisTemplate.opsForValue().get("VEHICLE");
List<Integer> integers = new ArrayList<>();
- if(ToolUtil.isNotEmpty(vehicle)){
+ if (ToolUtil.isNotEmpty(vehicle)) {
integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
}
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
List<PushOrder> querys = pushOrderService.querys(null, 1, openCity.getId());//获取需要推送的次数
- for(int i = 1; i <= 6; i++){
+ for (int i = 1; i <= 6; i++) {
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(id);
- if (null == orderPrivateCar || orderPrivateCar.getState() > 1) {
+ if (null == orderPrivateCar || (orderPrivateCar.getState() > 1 && orderPrivateCar.getState() != 11)) {
break;
}
int finalI = i;
PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
- System.out.println("pushOrder:"+pushOrder);
+ System.out.println("pushOrder:" + pushOrder);
int i2 = pushOrder.getPushTime() / 10;
- if(i2==0){
- i2=1;
+ if (i2 == 0) {
+ i2 = 1;
}
- for (int i1 = 0; i1 < i2 ; i1++) {
- if (orderPrivateCar.getState() > 1) {
+ for (int i1 = 0; i1 < i2; i1++) {
+ if (orderPrivateCar.getState() > 1 && orderPrivateCar.getState() != 11) {
break;
}
//获取空闲司机
List<Driver> list = driverService.queryIdleDriver(orderType, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
- list = list.stream().filter(e->e.getId()!=uid).collect(Collectors.toList());
+ list = list.stream().filter(e -> e.getId() != uid).collect(Collectors.toList());
if (list.size() > 0) {
double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
@@ -827,11 +867,11 @@
}
Thread.sleep(10000);//设置等待时间
Integer state = orderPrivateCar.getState();
- if (state > 1) {
+ if (state > 1 && state != 11) {
orderIds.remove(orderPrivateCar.getId());
return;
}
- if (i == 6 && state == 1) {
+ if (i == 6 && (state == 1 || state==11)) {
pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
orderPrivateCar.setState(10);
orderPrivateCarService.updateById(orderPrivateCar);
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
index 84d54b2..b007aba 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -71,7 +71,7 @@
public QianYunTongConfig getQianYunTongConfig() {
if("dev".equals(activeProfile)){
this.appkey = "10001104";
- this.privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem";
+ this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
this.userName = "xiaofei";
this.status = "1";
this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
index aab3be0..ceca48f 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -16,7 +16,7 @@
/**
* 私钥地址
*/
- String privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem";
+ String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
// String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
/**
* 私钥地址
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
index af07db3..8e8822b 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
@@ -58,10 +58,8 @@
this.merchNo = "B00000871";
this.encrpNo = "1055490595";
this.signNo = "1066348524";
- this.cer = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\1055490595.cer";
- this.sm2 = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\871_111111.sm2";
-// this.cer = "C:\\Users\\Administrator\\Desktop\\1055490595.cer";
-// this.sm2 = "C:\\Users\\Administrator\\Desktop\\871_111111.sm2";
+ this.cer = "C:\\Users\\Admin\\Desktop\\qyt\\1055490595.cer";
+ this.sm2 = "C:\\Users\\Admin\\Desktop\\qyt\\871_111111.sm2";
this.password = "111111";
}
if("test".equals(activeProfile)){
diff --git a/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml b/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
index b19af59..607f0f1 100644
--- a/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
+++ b/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -49,7 +49,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@192.168.110.111:8000/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
index 68ad9b0..6808d79 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
@@ -29,6 +29,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 控制器
@@ -300,6 +301,12 @@
tDriverPromotionActivity.setProvinceCode(province);
tDriverPromotionActivity.setCityCode(city);
tDriverPromotionActivity.setDistrictCode(area);
+
+ List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));
+
+ tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());
+ tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());
+ tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
String s = time.split(" - ")[0] + " 00:00:00";
String s1 = time.split(" - ")[1] + " 23:59:59";
tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));
@@ -356,6 +363,11 @@
tDriverPromotionActivity.setProvinceCode(province);
tDriverPromotionActivity.setCityCode(city);
tDriverPromotionActivity.setDistrictCode(area);
+ List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));
+
+ tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());
+ tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());
+ tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
String s = time.split(" - ")[0] + " 00:00:00";
String s1 = time.split(" - ")[1] + " 23:59:59";
tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java b/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
index b7c2c2d..c361dbf 100644
--- a/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
+++ b/MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
@@ -8,5 +8,5 @@
/**
* 业务网关接口地址
*/
- String zuul = "http://172.21.35.45:8010";
+ String zuul = "http://192.168.110.111:5000";
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
index fa08d38..02dcdbe 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -16,8 +16,8 @@
/**
* 私钥地址
*/
- String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
-// String privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem";
+// String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
+ String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
/**
* 私钥地址
*/
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application.yml b/UserQYTTravel/guns-admin/src/main/resources/application.yml
index a9283d4..326b544 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/application.yml
+++ b/UserQYTTravel/guns-admin/src/main/resources/application.yml
@@ -33,6 +33,7 @@
host: 192.168.110.80
port: 6379
password: 123456
+ database: 0
# redis:
# host: 172.21.35.151
# port: 6512
--
Gitblit v1.7.1