From f6e900623ffcfbe22eff51b00bf73670e0bc9c2d Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Sat, 29 Oct 2022 23:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsServiceImpl.java   | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

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 71b7340..5fa4098 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -166,7 +166,7 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public Map<String, Object> getGoodsByMap(Map gmap, int page, int limit) {
         Map retmap = new HashMap();
-
+        //分页
         int start = page > 1 ? (page - 1) * limit : 0;
         int end = page * limit;
 
@@ -204,30 +204,13 @@ public class GoodsServiceImpl implements GoodsService {
         Integer ishow = (Integer) gmap.get("g.is_recommend");
 
         List nglist = new ArrayList();
+        // goodslistvo 字段设置需跟前台显示一致
         List<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(gmap, orderkey, "DESC", limit, start);
         for (GoodsListVo gl : goodsListVoList) {
-            Map glmap = new HashMap();
-            glmap.put("id", gl.getId());
-            glmap.put("createtime", gl.getCreatetime());
-            glmap.put("goods_islicode", gl.getGoods_islicode());
-            glmap.put("goods_name", gl.getGoods_name());
-            glmap.put("username", gl.getUsername());
-            glmap.put("user_islicode", gl.getUser_islicode());
-            glmap.put("goods_type", gl.getGoods_type());
-            glmap.put("goods_status", gl.getGoods_status());
-            glmap.put("goods_detail_id", gl.getGoods_detail_id());
-            glmap.put("is_recommend", gl.getIs_recommend());
-            glmap.put("entrust_status", gl.getEntrust_status());
-            glmap.put("charges_type", gl.getCharges_type());
-            glmap.put("price", gl.getPrice());
-            glmap.put("goods_ownership_str", gl.getGoods_ownership_str());
-            glmap.put("createtime", gl.getCreatetime());
-            glmap.put("goods_entrust", gl.getGoods_entrust());
-            glmap.put("cnceltime", gl.getCanceltime());
-            glmap.put("goods_image", gl.getGoods_image());
-            glmap.put("stock", gl.getStock());
-            glmap.put("sale_count", gl.getSale_count());
-            glmap.put("click_count", gl.getClick_count());
+            //Map glmap = new HashMap();
+            JSONObject tmpjson = (JSONObject) JSON.toJSON(gl);
+            Map glmap= JSONObject.parseObject(tmpjson.toJSONString());
+
             JSONObject userjson = SzwhApiUtils.getApiUser(gl.getUser_islicode());
             Map umap = JSONObject.parseObject(userjson.getString("data"));
             glmap.put("user", umap);
@@ -558,10 +541,10 @@ public class GoodsServiceImpl implements GoodsService {
         //填充信息
         List retlist = new ArrayList();
         for (GoodsListVo g : glist) {
-            Map tgmap =new HashMap();
+
             //List tmpglist =new ArrayList();
             JSONObject tmpjson = (JSONObject) JSON.toJSON(g);
-            tgmap= JSONObject.parseObject(tmpjson.toJSONString());
+            Map tgmap= JSONObject.parseObject(tmpjson.toJSONString());
             //
             //GoodsDetail gd = goodsDetailMapper.getGoodsDetailBygid(g.getGoodsDetailId());
             //add