查询游客名单导出完善

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -2833,6 +2833,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         baseData.put("totalRooms", headInfo != null && headInfo.get("totalRooms") != null ? headInfo.get("totalRooms") : "");
         // 房型合计
         baseData.put("roomStats", headInfo != null && headInfo.get("roomStats") != null ? headInfo.get("roomStats") : "");
+        // 应收款
+        baseData.put("totalPayAmount", headInfo != null && headInfo.get("totalPayAmount") != null ? headInfo.get("totalPayAmount") : "");
+        // 实收款
+        baseData.put("totalActualAmount", headInfo != null && headInfo.get("totalActualAmount") != null ? headInfo.get("totalActualAmount") : "");
+        // 定金
+        baseData.put("deposi", headInfo != null && headInfo.get("deposi") != null ? headInfo.get("deposi") : "");
         // 时间
         LocalDateTime newDate = LocalDateTime.now();
         baseData.put("newDate", newDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -2957,7 +2963,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         item.put("birthday", StringUtils.isEmpty(visitor.getBirthday()) ? "" : visitor.getBirthday()); // 生日
                         item.put("mobile", StringUtils.isEmpty(visitor.getMobile()) ? "" : visitor.getMobile()); // 手机号
                         item.put("jz", StringUtils.isEmpty(visitor.getJz()) ? "" : visitor.getJz()); // 是否接站
-                        item.put("orderStatus", StringUtils.isEmpty(visitor.getOrderStatus()) ? "" : TradeOrderStatusEnum.valueOf(visitor.getOrderStatus()).getName()); // 订单状态
+                        item.put("orderStatus", StringUtils.isEmpty(visitor.getOrderStatus()) ? "" : TradeOrderStatusEnum.valueOf(Integer.valueOf(visitor.getOrderStatus())).getName()); // 订单状态
                         touristData.add(item);
                     }
                     roomIndex++;

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -199,6 +199,7 @@
             SUM(a.num4) AS leaderNum,
             SUM(a.payAmount) AS totalPayAmount,
             SUM(a.actual_amount) AS totalActualAmount,
+            SUM(a.deposi) as deposi,
             IFNULL((
                 SELECT GROUP_CONCAT(CONCAT( nationalityName, '(', num, ')') SEPARATOR ' ')
                 FROM (
@@ -271,6 +272,7 @@
             SUM(CASE WHEN tv.type = 'with' THEN 1 ELSE 0 END) AS num3,
             SUM(CASE WHEN tv.type = 'leader' THEN 1 ELSE 0 END) AS num4,
             td.pay_amount AS payAmount,
+            td.deposi,
             IFNULL(topay.actual_amount, 0) AS actual_amount
             FROM trade_order td
             INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0