소스 검색

订单汇总(未完)

lishiqiang 2 주 전
부모
커밋
340065effc

+ 1 - 1
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -616,7 +616,7 @@ public class OtcTradeOrderController {
 
     @PostMapping("/getOrderTotal")
     @Operation(summary = "获取订单统计")
-    @OperateLog(type = API, enable = false)
+    @OperateLog(type = API)
     public CommonResult<OrderTotalRespVO> getOrderTotal(@Valid @RequestBody OrderTotalQueryVO queryVO) {
         return success(otcTradeOrderService.getOrderTotal(queryVO));
     }

+ 3 - 2
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/OrderTotalRespVO.java

@@ -98,7 +98,7 @@ public class OrderTotalRespVO {
      */
     @Schema(description = "代收服务费")
     private BigDecimal collectionServiceMoney;
-
+    //order
     @Schema(description = "定金")
     private BigDecimal deposi;
 
@@ -107,10 +107,11 @@ public class OrderTotalRespVO {
 
     @Schema(description = "总加床数")
     private BigDecimal totalAddBedNum;
-
+    //order
     @Schema(description = "实收款房数")
     private BigDecimal totalPayedRoomNum;
 
+    //order
     @Schema(description = "未收款房数")
     private BigDecimal totalNotPayRoomNum;
 

+ 2 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -186,4 +186,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
     List<TradeOrderConfirmationCountryRespVO> selectConfirmationCountry(@Param("orderId") Long orderId);
 
     Map<String, Object> getOrderCount(@Param("vo") TradeOrderPageReqVO pageReqVO);
+
+    OrderTotalRespVO selectTotalByOrderIds(@Param("orderIds") List<Long> orderIds);
 }

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

@@ -589,9 +589,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Override
     public OrderTotalRespVO getOrderTotal(OrderTotalQueryVO queryVO) {
         List<Long> orderIds = queryVO.getOrderIds();
-
+        if (orderIds == null || orderIds.isEmpty()){
+            return null;
+        }
+        OrderTotalRespVO totalMap = tradeOrderMapper.selectTotalByOrderIds(orderIds);
         //TODO: 待完善 订单合计
-        return null;
+        return totalMap;
     }
 
 

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

@@ -2087,4 +2087,23 @@
         GROUP BY rrm.short_name,tv.floor
         ) p
     </select>
+
+
+
+    <select id="selectTotalByOrderIds" resultType="com.yc.ship.module.trade.controller.admin.order.vo.order.OrderTotalRespVO">
+        select sum(adult_total_num) adultTotalNum, sum(child_total_num) childTotalNum, sum(baby_total_num) babyTotalNum,
+        sum(with_total_num) withTotalNum, sum(leader_total_num) leaderTotalNum, sum(free_num) freeNum,
+        sum(order_money) orderMoney, sum(real_money) realMoney,  sum(other_money) otherMoney,
+        sum(adjust_total_money) adjustTotalMoney,  sum(with_amount) withTotalNumMoney,
+        sum(leader_amount) leaderTotalMoney, sum(free_amount) freeAmount, sum(service_money) serviceMoney,
+        sum(up_floor_total_num) upFloorTotalNum, sum(up_floor_total_money) upFloorTotalMoney,
+        sum(plus_total_num) plusTotalNum, sum(collection_service_money) collectionServiceMoney,
+        sum(use_room_total_num) totalRoomNum,sum(free_amount) freeAmount   from trade_order_total
+        where 1=1
+        AND old_order_id in
+        <foreach collection="orderIds" item="item" separator=","  open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
+