From 1992d2b854e10d6664de96403540c6552acd9ee8 Mon Sep 17 00:00:00 2001 From: xyiege Date: Thu, 27 Oct 2022 14:47:34 +0800 Subject: [PATCH] =?UTF-8?q?api=E5=95=86=E5=93=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szwh/controller/api/GoodsController.java | 50 +++++++++++++++---- .../cn/chjyj/szwh/mapper/GoodsMapper.java | 1 + .../szwh/service/impl/GoodsServiceImpl.java | 17 +++++++ .../resources/mapper/szwh/GoodsMapper.xml | 11 ++-- 4 files changed, 63 insertions(+), 16 deletions(-) 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 6cad326..23fdfad 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java @@ -5,6 +5,7 @@ import cn.chjyj.szwh.bean.Goods; import cn.chjyj.szwh.controller.BaseController; import cn.chjyj.szwh.service.GoodsService; import cn.chjyj.szwh.utils.AjaxResult; +import cn.chjyj.szwh.utils.SzwhApiUtils; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -82,7 +83,7 @@ public class GoodsController extends BaseController { JSONObject outjson = new JSONObject(); outjson.put("code","success"); outjson.put("msg","成功"); - outjson.put("userTime",(endtime-startTime)/1000); + outjson.put("useTime",(endtime-startTime)/1000); outjson.put("data",goodsList); return outjson; } @@ -93,11 +94,10 @@ public class GoodsController extends BaseController { List goodsList = goodsService.getTypeGoods(type,"",""); long endtime = System.currentTimeMillis(); long howUse = (endtime-startTime)/1000l; - //JSONObject outjson = AjaxResult.success("成功",howUse,goodsList); JSONObject outjson = new JSONObject(); outjson.put("code","success"); outjson.put("msg","成功"); - outjson.put("userTime",(endtime-startTime)/1000); + outjson.put("useTime",howUse); outjson.put("data",goodsList); return outjson; } @@ -107,38 +107,68 @@ public class GoodsController extends BaseController { */ @RequestMapping("/searchGoods") public JSONObject searchGoods(HttpServletRequest request){ - //{"pay_type":1,"goods_status":1,"record_type":"","entrust_name":"clytest1012-1", + //{"pay_type":1,"goods_status":1,"record_type":"", + // "entrust_name":"clytest1012-1", // "entrust_user_name":"","page":1,"limit":8} Map qmap = new HashMap<>(); //查询条件 qmap.put("is_delete",0);//正常状态的 - String payType = request.getParameter("pay_tyep"); - if(StringUtils.isNotBlank(payType)){ - qmap.put("pay_type",payType); + String payType = request.getParameter("pay_type"); + if(StringUtils.isNotBlank(payType)){ // 付费 or 免费 + Integer ipayType = Integer.valueOf(payType); + qmap.put("gd.charges_type",ipayType); } + //商品状态 String goodsStatus=request.getParameter("goods_status"); if(StringUtils.isNotBlank(goodsStatus)){ - qmap.put("goods_status",goodsStatus); + qmap.put("g.goods_status",goodsStatus); } + // 委托数据名称 String entrustName = request.getParameter("entrust_name"); if(StringUtils.isNotBlank(entrustName)){ qmap.put("gd.goods_name",entrustName); } + //数据类型 String recordType = request.getParameter("record_type"); if(StringUtils.isNotBlank(recordType)){ qmap.put("gd.goods_type",recordType); } + //委托方 String entrustUser= request.getParameter("entrust_user_name"); if(StringUtils.isNotBlank(entrustUser)){ - qmap.put("username",entrustUser); + qmap.put("g.entrust_name",entrustUser); } + // 授权类型 + String authorization=request.getParameter("authorization"); + if(StringUtils.isNotBlank(authorization) ){ + Integer igoodsEntrust = Integer.valueOf(authorization); + qmap.put("gd.goods_entrust",igoodsEntrust); + } + // goods islicode + String goodsIsliCode = request.getParameter("goods_islicode"); + if(StringUtils.isNotBlank(goodsIsliCode) && qmap.size()==0){ + qmap.put("gisli",goodsIsliCode); + } + // 系统标识，必须字段，不能为空 + String appkey=request.getParameter("appkey"); + if(StringUtils.isBlank(appkey)){ + // + } + + String orderType=request.getParameter("order_type"); + String norderType = StringUtils.isBlank(orderType)?"id":orderType; + qmap.put("orderway",orderType); + //顺序or 倒叙 + //String orderWay= request.getParameter("order"); + //String norder =StringUtils.isBlank(orderWay)?"DESC":orderWay; + String limit = request.getParameter("limit"); int ilimit = (StringUtils.isBlank(limit))?20:Integer.valueOf(limit); String page = request.getParameter("page"); Integer ipage =StringUtils.isBlank(page)?1:Integer.valueOf(page); - Map retmap =goodsService.getGoodsByMap(qmap,ipage,ilimit); + Map retmap =goodsService.getGoodsByMap(qmap,ipage,ilimit); JSONObject retjson = new JSONObject(); retjson.put("code","200"); diff --git a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java index 030c7e4..dcc8d40 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java @@ -107,6 +107,7 @@ public interface GoodsMapper { @Param("limit") int limit, @Param("startrs") int startrs); + /** * 新增商品 * @param goods 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 afc670a..99d7af1 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -206,6 +206,22 @@ public class GoodsServiceImpl implements GoodsService { glmap.put("goods_detail_id", gl.getGoods_detail_id()); glmap.put("is_recommend", gl.getIsRecommend()); 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()); + JSONObject userjson = SzwhApiUtils.getApiUser(gl.getUser_islicode()); + Map umap = JSONObject.parseObject(userjson.getString("data")); + glmap.put("user",umap); + // 商品资源 + List gslist = goodsSourceMapper.getGoodsSourceByIsli(gl.getGoods_islicode()); + glmap.put("source",gslist); //处理其他操作 glmap.put("key", gl.getGoods_islicode()); nglist.add(glmap); @@ -585,6 +601,7 @@ public class GoodsServiceImpl implements GoodsService { return retlist; } + @Override public int changeGoodsStatus(int status, int gid) { Map gmap =new HashMap(); diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml index 184ff87..69c30cf 100644 --- a/src/main/resources/mapper/szwh/GoodsMapper.xml +++ b/src/main/resources/mapper/szwh/GoodsMapper.xml @@ -64,18 +64,14 @@