From 9b3f6f5952d45ceeb0770fe4622721007b8fc79d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 二月 2024 15:32:51 +0800
Subject: [PATCH] 修改
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 33eb76b..45b3e09 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -3,8 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.smallLogistics.model.OrderLogisticsSpread;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
+import com.stylefeng.guns.modular.smallLogistics.server.impl.OrderLogisticsSpreadService;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.model.Reassign;
@@ -230,6 +233,9 @@
}
}
+
+ @Autowired
+ private OrderLogisticsSpreadService spreadService;
/**
* 获取服务中页面订单详情
* @param orderId
@@ -263,6 +269,22 @@
}else{
orderInfoWarpper.setOrderPositionList("");
}
+
+ List<OrderLogisticsSpread> orderLogisticsId = spreadService.selectList(new EntityWrapper<OrderLogisticsSpread>().eq("orderLogisticsId", orderId));
+ if (!orderLogisticsId.isEmpty()){
+ double sum = 0;
+ for (OrderLogisticsSpread orderLogisticsSpread : orderLogisticsId) {
+
+ if (orderLogisticsSpread.getPayType()!=null&&orderLogisticsSpread.getPayType() == 4) {
+ Double payMoney = orderLogisticsSpread.getPayMoney();
+ sum = sum + payMoney;
+ }
+ }
+ sum = sum+orderInfoWarpper.getPayMoney();
+ orderInfoWarpper.setPayMoney(sum);
+ }
+
+
return ResultUtil.success(orderInfoWarpper);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1