From d1cc28c9fd86017f4a0a9013554bf1602fef8bc8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 09:15:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 7 ++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 7 ++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/PushUtil.java | 32 ++++++++++++++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 28 +++----------
5 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index 255fcd7..bac4379 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -729,7 +729,7 @@
WaterVO waterVO = new WaterVO();
switch (orderCancel.getOrderType()){
case 1:
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel);
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId());
if (tOrderPrivateCar == null){
continue;
}
@@ -740,14 +740,7 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- waterVO.setPayType("手机支付");
- break;
- case 2:
- waterVO.setPayType("银行卡支付");
- break;
- }
+ waterVO.setPayType("手机支付");
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
@@ -798,7 +791,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -819,7 +812,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1349,14 +1342,7 @@
continue;
}
}
- switch (tOrderPrivateCar.getPayType()){
- case 1:
- waterVO.setPayType("手机支付");
- break;
- case 2:
- waterVO.setPayType("银行卡支付");
- break;
- }
+ waterVO.setPayType("手机支付");
// 专车
waterVO.setCode(tOrderPrivateCar.getOrderNum());
String string = orderCancel.getMoney().toString();
@@ -1407,7 +1393,7 @@
}
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
@@ -1428,7 +1414,7 @@
}
// 用户提现
for (TPubWithdrawal tPubWithdrawal : user) {
- if(payType!=null && payType == 1){
+ if(payType!=null && payType == 2){
break;
}
WaterVO waterVO = new WaterVO();
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 2a82173..1c19f1f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -901,6 +901,8 @@
return useMoneyVO;
}
+ @Autowired
+ private ISysRedPacketRecordService sysRedPacketRecordService;
/**
* 发放补贴统计
*/
@@ -1147,10 +1149,11 @@
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
- if (userRedPacketRecord.getRedPacketActivityId() == null){
+ if (userRedPacketRecord.getIsGrant() == 1){
// 后台发放的红包
- grantVO.setRemark("后台指定派发");
+ grantVO.setRemark("指定发放");
}
+
UserActivityRedenvelope userActivityRedenvelope =
userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
if (userActivityRedenvelope!=null){
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 0738804..a46284e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -349,12 +349,12 @@
new Thread(new Runnable() {
@Override
public void run() {
+ pushUtil.frozenOrder(finalOrderPrivateCar.getDriverId(),2);
pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, "");
}
}).start();
}
orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
- orderPrivateCar.setState(7);
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
@@ -593,7 +593,7 @@
if(orderPrivateCar.getIsplatPay()==2){
return "error";
}
- //添加已收入明细
+ //添加已收入明细
TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
Double taxi = company.getSpeMoney().doubleValue();
BigDecimal d = null;//企业收入
@@ -615,6 +615,9 @@
driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
driverService.updateById(driver);
orderPrivateCar.setIsplatPay(2);
+ orderPrivateCar.setPayManner(1);
+ orderPrivateCar.setState(8);
+ orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney());
tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
return SUCCESS_TIP;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/PushUtil.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/PushUtil.java
index e54a9d6..fd365f8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/PushUtil.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/PushUtil.java
@@ -44,9 +44,35 @@
private Map<String, Timer> taskMap = new HashMap<>();//存储定时推送的定时器
-
-
-
+ /**
+ * 后台 冻结订单 向司机端推送消息
+ * @param uid
+ * @param type
+ */
+ public void frozenOrder(Integer uid,Integer type){
+ System.err.println("后台 冻结订单 向司机端推送消息");
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("code", 200);
+ jsonObject.put("msg", "SUCCESS");
+ jsonObject.put("method", "FROZEN_ORDER");
+ Map<String, Object> map = new HashMap<>();
+ jsonObject.put("data", map);
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ //将请求头部和参数合成一个请求
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ params.add("msg", jsonObject.toJSONString());
+ params.add("id", String.valueOf(uid));
+ params.add("type", String.valueOf(type));
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+ String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println("后台 冻结订单 向司机端推送消息"+jsonObject1.getString("msg"));
+ }
+ }
/**
* 推送订单状态
* @param type 1=用户，2=司机
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
index 372ecf8..aff89ee 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
@@ -24,7 +24,7 @@
{title: '发放时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '补贴类型', field: 'type', visible: true, align: 'center', valign: 'middle'},
{title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
- {title: '领取用户id', field: 'name', visible: true, align: 'center', valign: 'middle',},
+ {title: '领取用户昵称', field: 'name', visible: true, align: 'center', valign: 'middle',},
{title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle',},
];
};
--
Gitblit v1.7.1