bilingfeng 2 лет назад
Родитель
Сommit
9b1c652443

+ 1 - 2
game-module/game-manage/src/main/java/com/zanxiang/manage/controller/OrderController.java

@@ -3,7 +3,6 @@ package com.zanxiang.manage.controller;
 import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.manage.domain.params.OrderParam;
-import com.zanxiang.manage.domain.vo.OrderCompleteListVO;
 import com.zanxiang.manage.domain.vo.OrderListVO;
 import com.zanxiang.manage.service.OrderService;
 import io.swagger.annotations.Api;
@@ -33,7 +32,7 @@ public class OrderController {
     @ApiOperation(value = "列表")
     @PostMapping(value = "/list")
     @PreAuthorize(permissionKey = "sdk:order:list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OrderCompleteListVO.class, responseContainer = "list")})
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = OrderListVO.class, responseContainer = "list")})
     public ResultVO<OrderListVO> list(@Validated @RequestBody OrderParam param) {
         return ResultVO.ok(orderService.orderList(param));
     }

+ 1 - 1
game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/OrderServiceImpl.java

@@ -120,7 +120,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             return new OrderListVO(param.toPage().getSize());
         }
         //统计:订单金额与实付金额
-        Order total = super.getOne(getListWrapper(param, agentIdList, "IFNULL(SUM(amount),0) orderAmount, IFNULL(SUM(real_amount),0) realAmount"));
+        Order total = super.getOne(getListWrapper(param, agentIdList, "IFNULL(SUM(amount),0) amount, IFNULL(SUM(real_amount),0) realAmount"));
         HashMap<String, BigDecimal> totalData = new HashMap<>();
         if (total == null) {
             totalData.put("totalOrderAmount", new BigDecimal("0.00"));