From 0b2f09fab807f43f8e9707d23c84671624424ba9 Mon Sep 17 00:00:00 2001
From: xyiege <xc@xyiege.com>
Date: Sun, 17 Jul 2022 16:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BE=93=E5=87=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/AdminAccountCloseController.java     | 18 ++++++++++++++++++
 .../controller/admin/AdminGoodsController.java |  6 ++----
 .../cn/chjyj/szwh/service/GoodsService.java    |  2 +-
 .../szwh/service/impl/GoodsServiceImpl.java    | 10 +++++++++-
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
index 10154ff..ff3d157 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -73,6 +74,23 @@ public class AdminAccountCloseController extends BaseController {
         jsonObject.put("msg","成功");
         return jsonObject;
     }
+
+    /**
+     * 资金结算获取账户详情
+     * @param userIsli
+     * @return
+     */
+    @RequestMapping("/getCloseAccountInfo")
+    public JSONObject getCloseAccountInfo(@RequestParam("user_isli") String userIsli){
+
+        jsonObject.put("code",200);
+        jsonObject.put("msg","成功");
+        return jsonObject;
+    }
+
+    public JSONObject ratioList(){
+        return jsonObject;
+    }
     /**
      * 获取支付方式
      * @return
diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
index 3c411dc..2ca9d88 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
@@ -100,10 +100,8 @@ public class AdminGoodsController extends BaseController {
             qmap.put("transaction",transaction);
         }
         // 查询返回的结果
-        Map retmap = goodsService.getGoodsByMap(qmap,ilimit);
-        retmap.put("start",start);
-        retmap.put("curr_page",page);
-        retmap.put("per_page",limit);
+        Map retmap = goodsService.getGoodsByMap(qmap,ipage,ilimit);
+
         // 结果
         jsonObject.put("code",200);
         jsonObject.put("msg","成功");
diff --git a/src/main/java/cn/chjyj/szwh/service/GoodsService.java b/src/main/java/cn/chjyj/szwh/service/GoodsService.java
index 11ab726..5de4728 100644
--- a/src/main/java/cn/chjyj/szwh/service/GoodsService.java
+++ b/src/main/java/cn/chjyj/szwh/service/GoodsService.java
@@ -41,5 +41,5 @@ public interface GoodsService {
      * @param limit 条目
      * @return
      */
-    Map<String,Object> getGoodsByMap(Map gmap,int limit);
+    Map<String,Object> getGoodsByMap(Map gmap,int page,int limit);
 }
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index bd00ead..bac2268 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -131,7 +131,7 @@ public class GoodsServiceImpl implements GoodsService {
      * @return
      */
     @Override
-    public Map<String,Object> getGoodsByMap(Map gmap, int limit) {
+    public Map<String,Object> getGoodsByMap(Map gmap, int page,int limit) {
         Map retmap =new HashMap();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -163,10 +163,18 @@ public class GoodsServiceImpl implements GoodsService {
         int total = goodsMapper.goodsCount(gmap);
         retmap.put("total",total);
 
+        int start = page>1?(page-1)*limit:0;
+        int end =page*limit;
+
         // 总的页
         int totalpage = (int)Math.ceil(total/limit);
         retmap.put("last_page",totalpage);
         retmap.put("per_page",limit);
+        retmap.put("start",start);
+        retmap.put("end",end);
+        retmap.put("curr_page",page);
+        retmap.put("per_page",limit);
+
 
         return retmap;
     }