|
|
|
@ -4,6 +4,8 @@ import cn.chjyj.szwh.bean.Goods; |
|
|
|
import cn.chjyj.szwh.controller.BaseController; |
|
|
|
import cn.chjyj.szwh.service.GoodsService; |
|
|
|
import com.alibaba.fastjson2.JSONObject; |
|
|
|
import com.alibaba.fastjson2.annotation.JSONField; |
|
|
|
import com.google.gson.JsonObject; |
|
|
|
import javafx.beans.binding.ObjectBinding; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.logging.Log; |
|
|
|
@ -27,6 +29,7 @@ public class GoodsController extends BaseController { |
|
|
|
|
|
|
|
/** |
|
|
|
* 添加到购物车 |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@RequestMapping(value = "/addShoppingCar") |
|
|
|
@ -95,6 +98,7 @@ public class GoodsController extends BaseController { |
|
|
|
|
|
|
|
/** |
|
|
|
* delelete user's shop car from redis |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@RequestMapping("/delShoppingCar") |
|
|
|
@ -116,6 +120,7 @@ public class GoodsController extends BaseController { |
|
|
|
/** |
|
|
|
* 手工导入商品信息 |
|
|
|
* post 方式提价 |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@PostMapping("/manuimport") |
|
|
|
@ -129,6 +134,7 @@ public class GoodsController extends BaseController { |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据类型获取委托信息 |
|
|
|
* |
|
|
|
* @param type |
|
|
|
* @param createtime |
|
|
|
* @param goods_type |
|
|
|
@ -161,78 +167,94 @@ public class GoodsController extends BaseController { |
|
|
|
outjson.put("data", goodsList); |
|
|
|
return outjson; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 接口处理搜索 |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@RequestMapping("/searchGoods") |
|
|
|
public JSONObject searchGoods(HttpServletRequest request){ |
|
|
|
public JSONObject searchGoods(@RequestBody String reqstr) { |
|
|
|
// {"appkey":"0acdbb709ee95707","entrust_user_name":"北京玖扬博文文化发展有限公司",
|
|
|
|
// "goods_status":"1","timestamp":"1667223238"}
|
|
|
|
|
|
|
|
//{"appkey":"0acdbb709ee95707","authorization":"","entrust_name":"","entrust_user_name":"",
|
|
|
|
// "goods_status":"1","limit":"16","order":"","order_type":"","page":"1","pay_type":"2","
|
|
|
|
// record_type":"","timestamp":"1667223235"}
|
|
|
|
|
|
|
|
log.info("searchGoods:" + reqstr); |
|
|
|
if (StringUtils.isEmpty(reqstr)) { |
|
|
|
jsonObject.put("code", "error"); |
|
|
|
jsonObject.put("msg", "请求参数异常"); |
|
|
|
return jsonObject; |
|
|
|
} |
|
|
|
JSONObject request = JSONObject.parseObject(reqstr); |
|
|
|
Map qmap = new HashMap<>(); //查询条件
|
|
|
|
qmap.put("is_delete", 0);//正常状态的
|
|
|
|
String payType = request.getParameter("pay_type"); |
|
|
|
String payType = request.getString("pay_type"); |
|
|
|
if (StringUtils.isNotBlank(payType)) { // 付费 or 免费
|
|
|
|
Integer ipayType = Integer.valueOf(payType); |
|
|
|
qmap.put("gd.charges_type", ipayType); |
|
|
|
} |
|
|
|
//商品状态
|
|
|
|
String goodsStatus=request.getParameter("goods_status"); |
|
|
|
String goodsStatus = request.getString("goods_status"); |
|
|
|
if (StringUtils.isNotBlank(goodsStatus)) { |
|
|
|
qmap.put("g.goods_status", goodsStatus); |
|
|
|
} |
|
|
|
// 委托数据名称
|
|
|
|
String entrustName = request.getParameter("entrust_name"); |
|
|
|
String entrustName = request.getString("entrust_name"); |
|
|
|
if (StringUtils.isNotBlank(entrustName)) { |
|
|
|
qmap.put("gd.goods_name", entrustName); |
|
|
|
} |
|
|
|
//数据类型
|
|
|
|
String recordType = request.getParameter("record_type"); |
|
|
|
String recordType = request.getString("record_type"); |
|
|
|
if (StringUtils.isNotBlank(recordType)) { |
|
|
|
qmap.put("gd.goods_type", recordType); |
|
|
|
} |
|
|
|
//委托方
|
|
|
|
String entrustUser= request.getParameter("entrust_user_name"); |
|
|
|
String entrustUser = request.getString("entrust_user_name"); |
|
|
|
if (StringUtils.isNotBlank(entrustUser)) { |
|
|
|
qmap.put("g.entrust_name", entrustUser); |
|
|
|
} |
|
|
|
|
|
|
|
// 授权类型
|
|
|
|
String authorization=request.getParameter("authorization"); |
|
|
|
String authorization = request.getString("authorization"); |
|
|
|
if (StringUtils.isNotBlank(authorization)) { |
|
|
|
Integer igoodsEntrust = Integer.valueOf(authorization); |
|
|
|
qmap.put("gd.goods_entrust", igoodsEntrust); |
|
|
|
} |
|
|
|
// goods islicode
|
|
|
|
String goodsIsliCode = request.getParameter("goods_islicode"); |
|
|
|
String goodsIsliCode = request.getString("goods_islicode"); |
|
|
|
if (StringUtils.isNotBlank(goodsIsliCode) && qmap.size() == 1) { |
|
|
|
qmap.put("g.gisli", goodsIsliCode); |
|
|
|
} |
|
|
|
// 系统标识,必须字段,不能为空
|
|
|
|
String appkey=request.getParameter("appkey"); |
|
|
|
String appkey = request.getString("appkey"); |
|
|
|
if (StringUtils.isBlank(appkey)) { |
|
|
|
//
|
|
|
|
} |
|
|
|
|
|
|
|
String orderType=request.getParameter("order_type"); |
|
|
|
// 排序字段
|
|
|
|
String orderType = request.getString("order_type"); |
|
|
|
String norderType = StringUtils.isBlank(orderType) ? "id" : orderType; |
|
|
|
qmap.put("orderway",orderType); |
|
|
|
qmap.put("orderway", norderType); |
|
|
|
|
|
|
|
//顺序or 倒叙
|
|
|
|
//String orderWay= request.getParameter("order");
|
|
|
|
//String norder =StringUtils.isBlank(orderWay)?"DESC":orderWay;
|
|
|
|
String orderWay= request.getString("order"); |
|
|
|
String norder =StringUtils.isBlank(orderWay)?"DESC":orderWay; |
|
|
|
|
|
|
|
String limit = request.getParameter("limit"); |
|
|
|
String limit = request.getString("limit"); |
|
|
|
int ilimit = (StringUtils.isBlank(limit)) ? 20 : Integer.valueOf(limit); |
|
|
|
String page = request.getParameter("page"); |
|
|
|
String page = request.getString("page"); |
|
|
|
Integer ipage = StringUtils.isBlank(page) ? 1 : Integer.valueOf(page); |
|
|
|
|
|
|
|
Map retmap = goodsService.getGoodsByMap(qmap, ipage, ilimit); |
|
|
|
|
|
|
|
JSONObject retjson = new JSONObject(); |
|
|
|
retjson.put("code","200"); |
|
|
|
retjson.put("msg","成功"); |
|
|
|
retjson.put("page",page); |
|
|
|
retjson.put("limit",limit); |
|
|
|
retjson.put("userTime","2"); |
|
|
|
retjson.put("data",retmap); |
|
|
|
return retjson; |
|
|
|
jsonObject.put("code", "200"); |
|
|
|
jsonObject.put("msg", "成功"); |
|
|
|
jsonObject.put("page", page); |
|
|
|
jsonObject.put("limit", limit); |
|
|
|
jsonObject.put("userTime", "2"); |
|
|
|
jsonObject.put("data", retmap); |
|
|
|
return jsonObject; |
|
|
|
} |
|
|
|
} |
|
|
|
|