From 3fa56d2c6151921ef786fa66f651a2ff5d9423d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 十一月 2025 15:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java | 2 +-
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 16 ++++++++++++----
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java | 12 ++++++++++++
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java | 2 +-
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 7 +++++--
5 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 4839844..1deed70 100644
--- a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -468,14 +468,17 @@
if(reassign.getPayType() == 1){//微信支付
String[] split1 = ids.split(",");
- resultUtil = payMoneyUtil.weixinpay("改派订单", "", ids + "_3_" + UUIDUtil.getRandomCode(5), totalMoney.toString(), "/base/wxReassign", "APP", "");
+// resultUtil = payMoneyUtil.weixinpay("改派订单", "", ids + "_3_" + UUIDUtil.getRandomCode(5), totalMoney.toString(), "/base/wxReassign", "APP", "");
+ resultUtil = douGongPayUtil.wxPayOrder(totalMoney.toString(), driver.getAppletsOpenId(), "改派订单", reassign.getOrderType(), String.valueOf(reassign.getId()), 2);
for(String id : split1){
paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 1, aDouble, "", 1);//添加预支付数据
}
}
if(reassign.getPayType() == 2){//支付宝
String[] split1 = ids.split(",");
- resultUtil = payMoneyUtil.alipay("改派订单", "改派订单", "", ids + "_3_" + UUIDUtil.getRandomCode(5), totalMoney.toString(), "/base/aliReassign");
+// resultUtil = payMoneyUtil.alipay("改派订单", "改派订单", "", ids + "_3_" + UUIDUtil.getRandomCode(5), totalMoney.toString(), "/base/aliReassign");
+ resultUtil = DouGongPayUtil.aliPayOrder(totalMoney.toString(), driver.getAppletsOpenId(), "改派订单", reassign.getOrderType(), String.valueOf(reassign.getId()), 2);
+
for(String id : split1){
paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 2, aDouble, "", 1);//添加预支付数据
}
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
index a0ef2c3..d2ac2f9 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -203,7 +203,7 @@
}
for (PaymentRecord query : querys) {
System.out.println("支付方式："+query.getPayType());
- if(query.getPayType() == 1){//微信
+ if(query.getPayType() == 1 || query.getPayType() == 2){//微信
//Map<String, String> map = payMoneyUtil.wxRefund(query.getCode(), tOrderLogistics.getId() + "_" + tOrderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5), query.getAmount().toString(), query.getAmount().toString(), "/base/cancleOrderWXPay");
//System.out.println("map:"+map);
//if(!"SUCCESS".equals(map.get("return_code"))){
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 20eb8aa..023a6d0 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -10,6 +10,7 @@
import com.stylefeng.guns.core.util.*;
import com.stylefeng.guns.modular.cloudPayment.example.AllocationExample;
import com.stylefeng.guns.modular.cloudPayment.req.AllocationReq;
+import com.stylefeng.guns.modular.huifu.biz.DouGongRefundBiz;
import com.stylefeng.guns.modular.huifu.biz.FenZhangUtil;
import com.stylefeng.guns.modular.system.controller.util.Base64Util;
import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
@@ -37,10 +38,7 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 快车改派管理控制器
@@ -822,6 +820,9 @@
@Autowired
private ITPubTransactionDetailsService itPubTransactionDetailsService;
+ @Autowired
+ private DouGongRefundBiz douGongRefundBiz;
+
/**
* 操作跨城改派管理
* optType 1=拒绝 2=取消
@@ -925,6 +926,13 @@
//添加交易明细
transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
}else{
+ TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", driver.getPhone()).eq("type", 1).last("limit 1"));
+ if(null == userWithdrawal){
+ return ResultUtil.error("该司机未进件");
+ }
+ FenZhangUtil.fenzhang(RequestSeqUtil.generate("TK"), DateUtil.format(new Date(), "yyyyMMdd"),orderCrossCity.getPayMoney().toString(),userWithdrawal.getHuiFuId());
+
// PaymentRecord query = paymentRecordService.query(1, null, null, tReassign.getOrderId(), 3, null, 2).get(0);
// if(null == query){
// return ResultUtil.error("订单还未进行支付");
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
index fdaeee3..264c565 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
@@ -68,6 +68,18 @@
@TableField("reqDate")
private String reqDate;
+
+ @TableField("category")
+ private Integer category;
+
+ public Integer getCategory() {
+ return category;
+ }
+
+ public void setCategory(Integer category) {
+ this.category = category;
+ }
+
public String getReqDate() {
return reqDate;
}
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
index 8acbaa5..c819db4 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
@@ -292,7 +292,7 @@
List<TCompany> companies = baseMapper.selectList(new EntityWrapper<TCompany>().eq("type", 2));
// 获取所有未分账的信息
- List<Income> state = incomeService.selectList(new EntityWrapper<Income>().eq("state", 0));
+ List<Income> state = incomeService.selectList(new EntityWrapper<Income>().eq("state", 0).eq("category",1));
for (TCompany company : companies) {
Integer paymentDays = company.getPaymentDays();
LocalDate localDate = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
--
Gitblit v1.7.1