From ba8cd5929d8b1eefa65f0b74345f983f94a19225 Mon Sep 17 00:00:00 2001 From: xyiege Date: Mon, 31 Oct 2022 20:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0jsonfield=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/chjyj/szwh/bean/Goods.java | 9 +++++++++ .../chjyj/szwh/controller/api/GoodsController.java | 7 ++----- .../chjyj/szwh/service/impl/GoodsServiceImpl.java | 14 ++++++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/bean/Goods.java b/src/main/java/cn/chjyj/szwh/bean/Goods.java index c071dda..53229ed 100644 --- a/src/main/java/cn/chjyj/szwh/bean/Goods.java +++ b/src/main/java/cn/chjyj/szwh/bean/Goods.java @@ -1,5 +1,7 @@ package cn.chjyj.szwh.bean; +import com.alibaba.fastjson2.annotation.JSONField; + import java.math.BigInteger; import java.sql.Timestamp; import java.util.Date; @@ -11,14 +13,19 @@ import java.util.Date; public class Goods { private Integer id; private Integer userId;//用户编号 + @JSONField(name = "user_islicode") private String userIslicode;//委托方isli标识码 private String username;//委托方名称 + @JSONField(name = "goods_detail_id") private Integer goodsDetailId;//商品明细id + @JSONField(name = "goods_islicode") private String goodsIslicode; //商品isli标识码 private String isLicode;//sliCode private Integer saleCount;//销售量 private BigInteger clickCount;//点击量 + @JSONField(name = "is_recommend") private Integer isRecommend;//是否推荐；0：否；1：是 + @JSONField(name = "recommend_sort") private Integer recommendSort;//推荐排序 private Date createTime; //创建时间 private Date updateTime;//修改时间 @@ -26,8 +33,10 @@ public class Goods { /** * 商品状态开关 */ + @JSONField(name = "goods_status") private Integer goodsStatus;//商品状态；1：上架中；2：下架中；3：已转让；4：已失效；5：冻结中；6：下架中 private Integer oldStatus;//是否是旧周期数据 0:yes + @JSONField(name = "entrust_status") private Integer entrustStatus;//委托接口委托数据状态 private Integer applyOut;//是否申请下架；0：否；1：是 private Integer isDeleted;//删除状态；0：未删除；1：已删除 diff --git a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java b/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java index 9dbf134..6929699 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java @@ -77,10 +77,9 @@ public class GoodsController extends BaseController { @RequestMapping("/getShoppingCar") public JSONObject getShoppingCar(@RequestBody String reqstr){ log.info("getShoppingCar"+reqstr); - long start = System.currentTimeMillis(); JSONObject request = JSONObject.parseObject(reqstr); String userIsli =request.getString("user_isli"); - + // 用户编号 if(StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)){ jsonObject.put("code","error"); jsonObject.put("msg","user_isli不能为空"); @@ -88,11 +87,9 @@ public class GoodsController extends BaseController { // List retlist =goodsService.getShoppingCar(userIsli); long end = System.currentTimeMillis(); - long howUse = (end-start)/1000l; - jsonObject.put("code","success"); + jsonObject.put("code",200); jsonObject.put("msg","成功"); jsonObject.put("data",retlist); - jsonObject.put("useTime",howUse); return jsonObject; } 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 ada02e0..21fd41f 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -678,12 +678,13 @@ public class GoodsServiceImpl implements GoodsService { String shopRedisKey = "car_" + userIsli; // get shopping car from redis Object shopCar = RedisUtil.get(shopRedisKey); - JSONObject shopCarJson = JSONObject.parseObject(shopCar.toString()); - JSONArray jsonArray = shopCarJson.getJSONArray("data"); if (shopCar == null) { //null return null; } + JSONObject shopCarJson = JSONObject.parseObject(shopCar.toString()); + JSONArray jsonArray = shopCarJson.getJSONArray("data"); + //分配比例 Map acrmap = new HashMap(); acrmap.put("is_deleted", 0); @@ -699,12 +700,13 @@ public class GoodsServiceImpl implements GoodsService { Map retmap = new HashMap<>(); JSONObject jsonObject = jsonArray.getJSONObject(x); String goodsIsli = jsonObject.getString("goods_isli"); - //购买年限 - String useYear = jsonObject.getString("use_years"); //goods Goods goods = goodsMapper.getGoodsByIsli(goodsIsli); - retmap.put("goods_islicode",goodsIsli); - retmap.put("username",goods.getUsername()); + retmap = JSONObject.parseObject(JSON.toJSONString(goods)); +// retmap.put("goods_islicode",goodsIsli); +// retmap.put("username",goods.getUsername()); +// GoodsListVo goodsListVo = goodsMapper.getSingleGoodsListVOByGoodsIsli(goodsIsli); +// retmap =JSONObject.parseObject(JSON.toJSONString(goodsListVo)); //goods detail GoodsDetail goodsDetail = goodsDetailMapper.getGoodsDetailBygid(goods.getGoodsDetailId());