From 19df67e19f23cd2a04d1c7f355e1e656f4140af4 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 17 四月 2025 20:04:14 +0800
Subject: [PATCH] 后台:首页统计、系统管理、广告管理、用户管理、商品分类管理

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 067bc89..0c8d8c1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +23,7 @@
 import com.ruoyi.order.vo.OrderSaleNum;
 import com.ruoyi.order.vo.VerifiableShopVo;
 import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.api.dto.ShopAnalysisDTO;
 import com.ruoyi.other.dto.AddGoodsDTO;
 import com.ruoyi.other.enums.PhoneType;
 import com.ruoyi.other.mapper.ShopMapper;
@@ -773,6 +775,16 @@
     }
 
     /**
+     * 编辑商品
+     */
+    @PostMapping("/editGoods")
+    @ApiOperation(value = "编辑商品", tags = {"门店后台-商品管理"})
+    public R<Integer> editGoods(@RequestBody AddGoodsDTO addGoodsDTO) {
+        return R.ok( shopService.editGoodsByShop(addGoodsDTO));
+    }
+
+
+    /**
      * 上、下架商品
      */
     @PostMapping("/status/{goodsId}")
@@ -807,11 +819,10 @@
 
     /**
      * 获取所有门店
-     * @return
      */
     @PostMapping("/getAllShop")
     public R<List<Shop>> getAllShop(){
-        List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+        List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0));
         return R.ok(list);
     }
 
@@ -855,6 +866,7 @@
     }
 
 
+/*
     @GetMapping("/getShopStatistics")
     public R<Map<String, BigDecimal> > getShopStatistics(@RequestParam("shopId") Integer shopId){
         LambdaQueryWrapper<Shop> queryWrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1);
@@ -864,16 +876,34 @@
         List<Shop> shopList = shopService.list(queryWrapper);
         BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
         BigDecimal giveawayMoney = BigDecimal.ZERO;
-       /* for (Shop shop : shopList) {
+       */
+/* for (Shop shop : shopList) {
             serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
             giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
-        }*/
+        }*//*
+
         Map<String, BigDecimal> map = new HashMap<>();
         map.put("serverGiveawayMoney", serverGiveawayMoney);
         map.put("giveawayMoney", giveawayMoney);
         return R.ok(map);
     }
+*/
 
+    /**
+     * 获取店铺收益 后天-工作台-收益分析
+     */
+    @PostMapping("/getIncomeAnalysis")
+    R<Map<String, Object>> getIncomeAnalysis(@RequestBody ShopAnalysisDTO shopAnalysisDTO){
+        QueryWrapper<Shop> queryWrapper=new QueryWrapper<>();
+        //余额  已提现 提现中 可提现
+        queryWrapper.select("sum(balance) as balance","sum(withdraw_money) as withdrawMoney"
+                ,"sum(withdraw_audit_money) as withdrawAuditMoney","sum(can_withdraw_money) as canWithdrawMoney");
+        queryWrapper.eq("del_flag",0);
+        if (shopAnalysisDTO.getShopId() != null) {
+            queryWrapper.eq("id", shopAnalysisDTO.getShopId());
+        }
+        return R.ok(shopService.getMap(queryWrapper));
+    }
 
 
 }

--
Gitblit v1.7.1