Browse Source

修改为POST json格式

master
xyiege 3 years ago
parent
commit
a317a2141e
  1. 234
      src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
  2. 3
      src/main/java/cn/chjyj/szwh/controller/api/OrderController.java

234
src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java

@ -4,6 +4,8 @@ import cn.chjyj.szwh.bean.Goods;
import cn.chjyj.szwh.controller.BaseController; import cn.chjyj.szwh.controller.BaseController;
import cn.chjyj.szwh.service.GoodsService; import cn.chjyj.szwh.service.GoodsService;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.annotation.JSONField;
import com.google.gson.JsonObject;
import javafx.beans.binding.ObjectBinding; import javafx.beans.binding.ObjectBinding;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -27,88 +29,90 @@ public class GoodsController extends BaseController {
/** /**
* 添加到购物车 * 添加到购物车
*
* @return * @return
*/ */
@RequestMapping(value = "/addShoppingCar") @RequestMapping(value = "/addShoppingCar")
public JSONObject addShoppingCar(@RequestBody String reqStr){ public JSONObject addShoppingCar(@RequestBody String reqStr) {
// {"appkey":"0acdbb709ee95707","goods_isli":"undefined", // {"appkey":"0acdbb709ee95707","goods_isli":"undefined",
// "timestamp":"1667194530","use_years":"1","user_isli":"899998-000000001642-1"} // "timestamp":"1667194530","use_years":"1","user_isli":"899998-000000001642-1"}
log.info("addShoppingCar:"+reqStr); log.info("addShoppingCar:" + reqStr);
JSONObject request =JSONObject.parseObject(reqStr); JSONObject request = JSONObject.parseObject(reqStr);
if(StringUtils.isEmpty(reqStr)){ if (StringUtils.isEmpty(reqStr)) {
jsonObject.put("code","error"); jsonObject.put("code", "error");
jsonObject.put("msg","请求数据不能为空"); jsonObject.put("msg", "请求数据不能为空");
} }
long start=System.currentTimeMillis(); long start = System.currentTimeMillis();
String userIsli = request.getString("user_isli"); String userIsli = request.getString("user_isli");
if(StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)){ if (StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)) {
jsonObject.put("code","error"); jsonObject.put("code", "error");
jsonObject.put("msg","user_isli不能为空"); jsonObject.put("msg", "user_isli不能为空");
} }
String goodsIsli = request.getString("goods_isli"); String goodsIsli = request.getString("goods_isli");
if(StringUtils.isEmpty(goodsIsli)|| "undefined".equals(goodsIsli)){ if (StringUtils.isEmpty(goodsIsli) || "undefined".equals(goodsIsli)) {
jsonObject.put("code","error"); jsonObject.put("code", "error");
jsonObject.put("msg","goods_isli不能为空"); jsonObject.put("msg", "goods_isli不能为空");
} }
String userYears= request.getString("use_years"); String userYears = request.getString("use_years");
Integer uyears = 1; Integer uyears = 1;
if(StringUtils.isNotEmpty(userYears)){ if (StringUtils.isNotEmpty(userYears)) {
uyears=Integer.valueOf(userYears); uyears = Integer.valueOf(userYears);
}else{ } else {
jsonObject.put("code","error"); jsonObject.put("code", "error");
jsonObject.put("msg","use_years不能为空"); jsonObject.put("msg", "use_years不能为空");
} }
// do add // do add
Map<String,Object> retmap =goodsService.addShopCar(userIsli,goodsIsli,uyears); Map<String, Object> retmap = goodsService.addShopCar(userIsli, goodsIsli, uyears);
if(retmap!=null){ if (retmap != null) {
// get msg // get msg
jsonObject.put("code",retmap.get("code")); jsonObject.put("code", retmap.get("code"));
jsonObject.put("msg",retmap.get("msg")); jsonObject.put("msg", retmap.get("msg"));
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
long howUse=(end-start)/1000l; long howUse = (end - start) / 1000l;
jsonObject.put("useTime",howUse); jsonObject.put("useTime", howUse);
return jsonObject; return jsonObject;
} }
@RequestMapping("/getShoppingCar") @RequestMapping("/getShoppingCar")
public JSONObject getShoppingCar(@RequestBody String reqstr){ public JSONObject getShoppingCar(@RequestBody String reqstr) {
log.info("getShoppingCar"+reqstr); log.info("getShoppingCar" + reqstr);
JSONObject request = JSONObject.parseObject(reqstr); JSONObject request = JSONObject.parseObject(reqstr);
String userIsli =request.getString("user_isli"); String userIsli = request.getString("user_isli");
// 用户编号 // 用户编号
if(StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)){ if (StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)) {
jsonObject.put("code","error"); jsonObject.put("code", "error");
jsonObject.put("msg","user_isli不能为空"); jsonObject.put("msg", "user_isli不能为空");
} }
// //
List retlist =goodsService.getShoppingCar(userIsli); List retlist = goodsService.getShoppingCar(userIsli);
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
jsonObject.put("code",200); jsonObject.put("code", 200);
jsonObject.put("msg","成功"); jsonObject.put("msg", "成功");
jsonObject.put("data",retlist); jsonObject.put("data", retlist);
return jsonObject; return jsonObject;
} }
/** /**
* delelete user's shop car from redis * delelete user's shop car from redis
*
* @return * @return
*/ */
@RequestMapping("/delShoppingCar") @RequestMapping("/delShoppingCar")
public JSONObject delShoppingCar(HttpServletRequest request){ public JSONObject delShoppingCar(HttpServletRequest request) {
long start =System.currentTimeMillis(); long start = System.currentTimeMillis();
String userIsli = request.getParameter("user_isli"); String userIsli = request.getParameter("user_isli");
String goodsIsli = request.getParameter("goods_isli"); String goodsIsli = request.getParameter("goods_isli");
goodsService.delShoppingCar(userIsli,goodsIsli); goodsService.delShoppingCar(userIsli, goodsIsli);
long end =System.currentTimeMillis(); long end = System.currentTimeMillis();
long howuse =(end-start)/1000l; long howuse = (end - start) / 1000l;
jsonObject.put("code",200); jsonObject.put("code", 200);
jsonObject.put("msg","成功"); jsonObject.put("msg", "成功");
jsonObject.put("usetime",howuse); jsonObject.put("usetime", howuse);
return jsonObject; return jsonObject;
} }
@ -116,123 +120,141 @@ public class GoodsController extends BaseController {
/** /**
* 手工导入商品信息 * 手工导入商品信息
* post 方式提价 * post 方式提价
*
* @return * @return
*/ */
@PostMapping("/manuimport") @PostMapping("/manuimport")
public JSONObject manuImport(@RequestBody String jsonStr){ public JSONObject manuImport(@RequestBody String jsonStr) {
JSONObject request =JSONObject.parseObject(jsonStr); JSONObject request = JSONObject.parseObject(jsonStr);
int icount = goodsService.manuImportGoods(request); int icount = goodsService.manuImportGoods(request);
jsonObject.put("count",icount); jsonObject.put("count", icount);
jsonObject.put("msg","成功"); jsonObject.put("msg", "成功");
return jsonObject; return jsonObject;
} }
/** /**
* 根据类型获取委托信息 * 根据类型获取委托信息
*
* @param type * @param type
* @param createtime * @param createtime
* @param goods_type * @param goods_type
* @return * @return
*/ */
@RequestMapping("/getTypeGoods") @RequestMapping("/getTypeGoods")
public JSONObject getTypeGoods(String type, String createtime, String goods_type){ public JSONObject getTypeGoods(String type, String createtime, String goods_type) {
//10长的时间戳 //10长的时间戳
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
List<Goods> goodsList = goodsService.getTypeGoods(type,createtime,goods_type); List<Goods> goodsList = goodsService.getTypeGoods(type, createtime, goods_type);
long endtime = System.currentTimeMillis(); long endtime = System.currentTimeMillis();
JSONObject outjson = new JSONObject(); JSONObject outjson = new JSONObject();
outjson.put("code","success"); outjson.put("code", "success");
outjson.put("msg","成功"); outjson.put("msg", "成功");
outjson.put("useTime",(endtime-startTime)/1000); outjson.put("useTime", (endtime - startTime) / 1000);
outjson.put("data",goodsList); outjson.put("data", goodsList);
return outjson; return outjson;
} }
@PostMapping("/getTypeGoods/{type}") @PostMapping("/getTypeGoods/{type}")
public JSONObject getTypeGoodsRest(@PathVariable String type){ public JSONObject getTypeGoodsRest(@PathVariable String type) {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
List<Goods> goodsList = goodsService.getTypeGoods(type,"",""); List<Goods> goodsList = goodsService.getTypeGoods(type, "", "");
long endtime = System.currentTimeMillis(); long endtime = System.currentTimeMillis();
long howUse = (endtime-startTime)/1000l; long howUse = (endtime - startTime) / 1000l;
JSONObject outjson = new JSONObject(); JSONObject outjson = new JSONObject();
outjson.put("code","success"); outjson.put("code", "success");
outjson.put("msg","成功"); outjson.put("msg", "成功");
outjson.put("useTime",howUse); outjson.put("useTime", howUse);
outjson.put("data",goodsList); outjson.put("data", goodsList);
return outjson; return outjson;
} }
/** /**
* 接口处理搜索 * 接口处理搜索
*
* @return * @return
*/ */
@RequestMapping("/searchGoods") @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<>(); //查询条件 Map qmap = new HashMap<>(); //查询条件
qmap.put("is_delete",0);//正常状态的 qmap.put("is_delete", 0);//正常状态的
String payType = request.getParameter("pay_type"); String payType = request.getString("pay_type");
if(StringUtils.isNotBlank(payType)){ // 付费 or 免费 if (StringUtils.isNotBlank(payType)) { // 付费 or 免费
Integer ipayType = Integer.valueOf(payType); Integer ipayType = Integer.valueOf(payType);
qmap.put("gd.charges_type",ipayType); qmap.put("gd.charges_type", ipayType);
} }
//商品状态 //商品状态
String goodsStatus=request.getParameter("goods_status"); String goodsStatus = request.getString("goods_status");
if(StringUtils.isNotBlank(goodsStatus)){ if (StringUtils.isNotBlank(goodsStatus)) {
qmap.put("g.goods_status",goodsStatus); qmap.put("g.goods_status", goodsStatus);
} }
// 委托数据名称 // 委托数据名称
String entrustName = request.getParameter("entrust_name"); String entrustName = request.getString("entrust_name");
if(StringUtils.isNotBlank(entrustName)){ if (StringUtils.isNotBlank(entrustName)) {
qmap.put("gd.goods_name",entrustName); qmap.put("gd.goods_name", entrustName);
} }
//数据类型 //数据类型
String recordType = request.getParameter("record_type"); String recordType = request.getString("record_type");
if(StringUtils.isNotBlank(recordType)){ if (StringUtils.isNotBlank(recordType)) {
qmap.put("gd.goods_type",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)){ if (StringUtils.isNotBlank(entrustUser)) {
qmap.put("g.entrust_name",entrustUser); qmap.put("g.entrust_name", entrustUser);
} }
// 授权类型 // 授权类型
String authorization=request.getParameter("authorization"); String authorization = request.getString("authorization");
if(StringUtils.isNotBlank(authorization) ){ if (StringUtils.isNotBlank(authorization)) {
Integer igoodsEntrust = Integer.valueOf(authorization); Integer igoodsEntrust = Integer.valueOf(authorization);
qmap.put("gd.goods_entrust",igoodsEntrust); qmap.put("gd.goods_entrust", igoodsEntrust);
} }
// goods islicode // goods islicode
String goodsIsliCode = request.getParameter("goods_islicode"); String goodsIsliCode = request.getString("goods_islicode");
if(StringUtils.isNotBlank(goodsIsliCode) && qmap.size()==1){ if (StringUtils.isNotBlank(goodsIsliCode) && qmap.size() == 1) {
qmap.put("g.gisli",goodsIsliCode); qmap.put("g.gisli", goodsIsliCode);
} }
// 系统标识,必须字段,不能为空 // 系统标识,必须字段,不能为空
String appkey=request.getParameter("appkey"); String appkey = request.getString("appkey");
if(StringUtils.isBlank(appkey)){ if (StringUtils.isBlank(appkey)) {
// //
} }
// 排序字段
String orderType = request.getString("order_type");
String norderType = StringUtils.isBlank(orderType) ? "id" : orderType;
qmap.put("orderway", norderType);
String orderType=request.getParameter("order_type");
String norderType = StringUtils.isBlank(orderType)?"id":orderType;
qmap.put("orderway",orderType);
//顺序or 倒叙 //顺序or 倒叙
//String orderWay= request.getParameter("order"); String orderWay= request.getString("order");
//String norder =StringUtils.isBlank(orderWay)?"DESC":orderWay; 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); 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); 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(); jsonObject.put("code", "200");
retjson.put("code","200"); jsonObject.put("msg", "成功");
retjson.put("msg","成功"); jsonObject.put("page", page);
retjson.put("page",page); jsonObject.put("limit", limit);
retjson.put("limit",limit); jsonObject.put("userTime", "2");
retjson.put("userTime","2"); jsonObject.put("data", retmap);
retjson.put("data",retmap); return jsonObject;
return retjson;
} }
} }

3
src/main/java/cn/chjyj/szwh/controller/api/OrderController.java

@ -133,7 +133,8 @@ public class OrderController extends BaseController {
* @return * @return
*/ */
@RequestMapping("/createOrder") @RequestMapping("/createOrder")
public JSONObject createOrder(HttpServletRequest request) { public JSONObject createOrder(HttpServletRequest request,@RequestBody String reqstr) {
log.info("createOrder:"+reqstr);
//goods_isli=010007-00000000347399999999-2 //goods_isli=010007-00000000347399999999-2
// &is_car=2&user_isli=899998-000000001640-3 // &is_car=2&user_isli=899998-000000001640-3
// &use_years=99&random=0.23348573938145045 // &use_years=99&random=0.23348573938145045

Loading…
Cancel
Save