From 1725e64e39e120a94c694b7c18ed313c98a411ba Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 九月 2024 09:26:32 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java |   72 +++++++++++++++--------------------
 1 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 950f938..3ec44b2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -7,9 +7,14 @@
 import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
 import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
 import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.api.dto.SettlementConfirmAdd;
+import com.ruoyi.order.api.model.TSettlementConfirm;
+import com.ruoyi.order.api.query.SettlementListQuery;
 import com.ruoyi.order.vo.ChargingOrderListInfoVO;
 import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
 import com.ruoyi.order.api.model.ChargingListQuery;
@@ -18,6 +23,7 @@
 import com.ruoyi.payment.api.feignClient.WxPaymentClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,59 +44,43 @@
 
     @Resource
     private TChargingOrderService chargingOrderService;
-    @Autowired
-    private TokenService tokenService;
-    @Autowired
-    private TOrderEvaluateService orderEvaluateService;
-
     @Resource
-    private WxPaymentClient wxPaymentClient;
-
-    @Resource
-    private RedisService redisService;
-
-    @Resource
-    private AliPaymentClient aliPaymentClient;
-    @Resource
-    private TShoppingOrderService shoppingOrderService;
-
-    @Resource
-    private AppUserClient appUserClient;
-
-    @Resource
-    private TVipOrderService vipOrderService;
-    @Resource
-    private ParkingLotClient parkingLotClient;
-    @Resource
-    private TChargingOrderRefundService chargingOrderRefundService;
-
-    @Resource
-    private TShoppingOrderRefundService shoppingOrderRefundService;
-    @Resource
-    private TVipOrderRefundService vipOrderRefundService;
-    @Resource
-    private SiteClient siteClient;
-    @Resource
-    private ChargingPileClient chargingPileClient;
-    @Resource
-    private ChargingGunClient chargingGunClient;
-    @Resource
-    private AppUserCarClient appUserCarClient;
-    @Resource
-    private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
-    @ResponseBody
+    private TSettlementConfirmService tSettlementConfirmService;
     @PostMapping(value = "/chargingList")
     @ApiOperation(value = "充电时段统计列表", tags = {"管理后台-财务结算"})
     public AjaxResult<ChargingOrderTimeVO> chargingList(@RequestBody ChargingListQuery dto) {
         ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
         return AjaxResult.success(res);
     }
-    @ResponseBody
     @GetMapping(value = "/chargingInfo")
     @ApiOperation(value = "充电时段统计列表-查看详情", tags = {"管理后台-财务结算"})
     public AjaxResult<ChargingOrderListInfoVO> chargingInfo(String uid) {
         ChargingOrderListInfoVO res = chargingOrderService.chargingInfo(uid);
         return AjaxResult.success(res);
     }
+
+    @GetMapping(value = "/settlementTotal")
+    @ApiOperation(value = "结算确认表-列表查询", tags = {"管理后台-财务结算"})
+    @ApiParam(name = "time", value = "汇报时间yyyy-MM")
+    public AjaxResult<ChargingOrderListInfoVO> settlementTotal(String time) {
+        return AjaxResult.success(null);
+    }
+    @PostMapping(value = "/settlementAdd")
+    @ApiOperation(value = "结算确认表-生成/保存结算确认表", tags = {"管理后台-财务结算"})
+    public R<TSettlementConfirm> settlementAdd(@RequestBody SettlementConfirmAdd dto) {
+        TSettlementConfirm res = chargingOrderService.settlementAdd(dto);
+        return R.ok(res);
+    }
+    @PostMapping(value = "/settlementList")
+    @ApiOperation(value = "结算表记录-列表查询", tags = {"管理后台-财务结算"})
+    public R<PageInfo<TSettlementConfirm>> settlementList(@RequestBody SettlementListQuery dto) {
+        PageInfo<TSettlementConfirm> res = chargingOrderService.settlementList(dto);
+        return R.ok(res);
+    }
+    @GetMapping(value = "/downloadSettlement/{uid}")
+    public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid) {
+        return R.ok(tSettlementConfirmService.getById(uid));
+    }
+
 }
 

--
Gitblit v1.7.1