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 6929699..6ac54a4 100644
--- a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java
+++ b/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.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,88 +29,90 @@ public class GoodsController extends BaseController {
 
     /**
      * 添加到购物车
+     *
      * @return
      */
     @RequestMapping(value = "/addShoppingCar")
-    public JSONObject addShoppingCar(@RequestBody String reqStr){
+    public JSONObject addShoppingCar(@RequestBody String reqStr) {
 //        {"appkey":"0acdbb709ee95707","goods_isli":"undefined",
 //                "timestamp":"1667194530","use_years":"1","user_isli":"899998-000000001642-1"}
-        log.info("addShoppingCar:"+reqStr);
-        JSONObject request =JSONObject.parseObject(reqStr);
-        if(StringUtils.isEmpty(reqStr)){
-            jsonObject.put("code","error");
-            jsonObject.put("msg","请求数据不能为空");
+        log.info("addShoppingCar:" + reqStr);
+        JSONObject request = JSONObject.parseObject(reqStr);
+        if (StringUtils.isEmpty(reqStr)) {
+            jsonObject.put("code", "error");
+            jsonObject.put("msg", "请求数据不能为空");
         }
 
-        long start=System.currentTimeMillis();
+        long start = System.currentTimeMillis();
         String userIsli = request.getString("user_isli");
-        if(StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)){
-            jsonObject.put("code","error");
-            jsonObject.put("msg","user_isli不能为空");
+        if (StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)) {
+            jsonObject.put("code", "error");
+            jsonObject.put("msg", "user_isli不能为空");
         }
 
         String goodsIsli = request.getString("goods_isli");
-        if(StringUtils.isEmpty(goodsIsli)|| "undefined".equals(goodsIsli)){
-            jsonObject.put("code","error");
-            jsonObject.put("msg","goods_isli不能为空");
+        if (StringUtils.isEmpty(goodsIsli) || "undefined".equals(goodsIsli)) {
+            jsonObject.put("code", "error");
+            jsonObject.put("msg", "goods_isli不能为空");
         }
-        String userYears= request.getString("use_years");
+        String userYears = request.getString("use_years");
         Integer uyears = 1;
-        if(StringUtils.isNotEmpty(userYears)){
-            uyears=Integer.valueOf(userYears);
-        }else{
-            jsonObject.put("code","error");
-            jsonObject.put("msg","use_years不能为空");
+        if (StringUtils.isNotEmpty(userYears)) {
+            uyears = Integer.valueOf(userYears);
+        } else {
+            jsonObject.put("code", "error");
+            jsonObject.put("msg", "use_years不能为空");
         }
 
         // do add
-        Map<String,Object> retmap =goodsService.addShopCar(userIsli,goodsIsli,uyears);
-        if(retmap!=null){
+        Map<String, Object> retmap = goodsService.addShopCar(userIsli, goodsIsli, uyears);
+        if (retmap != null) {
             // get msg
-            jsonObject.put("code",retmap.get("code"));
-            jsonObject.put("msg",retmap.get("msg"));
+            jsonObject.put("code", retmap.get("code"));
+            jsonObject.put("msg", retmap.get("msg"));
         }
         long end = System.currentTimeMillis();
-        long howUse=(end-start)/1000l;
-        jsonObject.put("useTime",howUse);
+        long howUse = (end - start) / 1000l;
+        jsonObject.put("useTime", howUse);
         return jsonObject;
     }
 
     @RequestMapping("/getShoppingCar")
-    public JSONObject getShoppingCar(@RequestBody String reqstr){
-        log.info("getShoppingCar"+reqstr);
+    public JSONObject getShoppingCar(@RequestBody String reqstr) {
+        log.info("getShoppingCar" + 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)){
-            jsonObject.put("code","error");
-            jsonObject.put("msg","user_isli不能为空");
+        if (StringUtils.isEmpty(userIsli) || "undefined".equals(userIsli)) {
+            jsonObject.put("code", "error");
+            jsonObject.put("msg", "user_isli不能为空");
         }
         //
-        List retlist =goodsService.getShoppingCar(userIsli);
+        List retlist = goodsService.getShoppingCar(userIsli);
         long end = System.currentTimeMillis();
-        jsonObject.put("code",200);
-        jsonObject.put("msg","成功");
-        jsonObject.put("data",retlist);
+        jsonObject.put("code", 200);
+        jsonObject.put("msg", "成功");
+        jsonObject.put("data", retlist);
         return jsonObject;
     }
 
     /**
      * delelete user's shop car from redis
+     *
      * @return
      */
     @RequestMapping("/delShoppingCar")
-    public JSONObject delShoppingCar(HttpServletRequest request){
-        long start =System.currentTimeMillis();
+    public JSONObject delShoppingCar(HttpServletRequest request) {
+        long start = System.currentTimeMillis();
         String userIsli = request.getParameter("user_isli");
         String goodsIsli = request.getParameter("goods_isli");
-        goodsService.delShoppingCar(userIsli,goodsIsli);
-        long end =System.currentTimeMillis();
-        long howuse =(end-start)/1000l;
+        goodsService.delShoppingCar(userIsli, goodsIsli);
+        long end = System.currentTimeMillis();
+        long howuse = (end - start) / 1000l;
 
-        jsonObject.put("code",200);
-        jsonObject.put("msg","成功");
-        jsonObject.put("usetime",howuse);
+        jsonObject.put("code", 200);
+        jsonObject.put("msg", "成功");
+        jsonObject.put("usetime", howuse);
 
         return jsonObject;
     }
@@ -116,123 +120,141 @@ public class GoodsController extends BaseController {
     /**
      * 手工导入商品信息
      * post 方式提价
+     *
      * @return
      */
     @PostMapping("/manuimport")
-    public JSONObject manuImport(@RequestBody String jsonStr){
-        JSONObject request =JSONObject.parseObject(jsonStr);
+    public JSONObject manuImport(@RequestBody String jsonStr) {
+        JSONObject request = JSONObject.parseObject(jsonStr);
         int icount = goodsService.manuImportGoods(request);
-        jsonObject.put("count",icount);
-        jsonObject.put("msg","成功");
+        jsonObject.put("count", icount);
+        jsonObject.put("msg", "成功");
         return jsonObject;
     }
 
     /**
      * 根据类型获取委托信息
+     *
      * @param type
      * @param createtime
      * @param goods_type
      * @return
      */
     @RequestMapping("/getTypeGoods")
-    public JSONObject getTypeGoods(String type, String createtime, String goods_type){
+    public JSONObject getTypeGoods(String type, String createtime, String goods_type) {
         //10长的时间戳
         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();
         JSONObject outjson = new JSONObject();
-        outjson.put("code","success");
-        outjson.put("msg","成功");
-        outjson.put("useTime",(endtime-startTime)/1000);
-        outjson.put("data",goodsList);
+        outjson.put("code", "success");
+        outjson.put("msg", "成功");
+        outjson.put("useTime", (endtime - startTime) / 1000);
+        outjson.put("data", goodsList);
         return outjson;
     }
 
     @PostMapping("/getTypeGoods/{type}")
-    public JSONObject getTypeGoodsRest(@PathVariable String type){
+    public JSONObject getTypeGoodsRest(@PathVariable String type) {
         long startTime = System.currentTimeMillis();
-        List<Goods> goodsList = goodsService.getTypeGoods(type,"","");
+        List<Goods> goodsList = goodsService.getTypeGoods(type, "", "");
         long endtime = System.currentTimeMillis();
-        long howUse = (endtime-startTime)/1000l;
+        long howUse = (endtime - startTime) / 1000l;
         JSONObject outjson = new JSONObject();
-        outjson.put("code","success");
-        outjson.put("msg","成功");
-        outjson.put("useTime",howUse);
-        outjson.put("data",goodsList);
+        outjson.put("code", "success");
+        outjson.put("msg", "成功");
+        outjson.put("useTime", howUse);
+        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");
-        if(StringUtils.isNotBlank(payType)){ // 付费 or 免费
+        qmap.put("is_delete", 0);//正常状态的
+        String payType = request.getString("pay_type");
+        if (StringUtils.isNotBlank(payType)) { // 付费 or 免费
             Integer ipayType = Integer.valueOf(payType);
-            qmap.put("gd.charges_type",ipayType);
+            qmap.put("gd.charges_type", ipayType);
         }
         //商品状态
-        String goodsStatus=request.getParameter("goods_status");
-        if(StringUtils.isNotBlank(goodsStatus)){
-            qmap.put("g.goods_status",goodsStatus);
+        String goodsStatus = request.getString("goods_status");
+        if (StringUtils.isNotBlank(goodsStatus)) {
+            qmap.put("g.goods_status", goodsStatus);
         }
         // 委托数据名称
-        String entrustName = request.getParameter("entrust_name");
-        if(StringUtils.isNotBlank(entrustName)){
-            qmap.put("gd.goods_name",entrustName);
+        String entrustName = request.getString("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 recordType = request.getString("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("g.entrust_name",entrustUser);
+        String entrustUser = request.getString("entrust_user_name");
+        if (StringUtils.isNotBlank(entrustUser)) {
+            qmap.put("g.entrust_name", entrustUser);
         }
 
         // 授权类型
-        String authorization=request.getParameter("authorization");
-        if(StringUtils.isNotBlank(authorization) ){
+        String authorization = request.getString("authorization");
+        if (StringUtils.isNotBlank(authorization)) {
             Integer igoodsEntrust = Integer.valueOf(authorization);
-            qmap.put("gd.goods_entrust",igoodsEntrust);
+            qmap.put("gd.goods_entrust", igoodsEntrust);
         }
         // goods islicode
-        String goodsIsliCode = request.getParameter("goods_islicode");
-        if(StringUtils.isNotBlank(goodsIsliCode) && qmap.size()==1){
-            qmap.put("g.gisli",goodsIsliCode);
+        String goodsIsliCode = request.getString("goods_islicode");
+        if (StringUtils.isNotBlank(goodsIsliCode) && qmap.size() == 1) {
+            qmap.put("g.gisli", goodsIsliCode);
         }
         // 系统标识，必须字段，不能为空
-        String appkey=request.getParameter("appkey");
-        if(StringUtils.isBlank(appkey)){
+        String appkey = request.getString("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 倒叙
-        //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);
-
-        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;
+        String orderWay= request.getString("order");
+        String norder =StringUtils.isBlank(orderWay)?"DESC":orderWay;
+
+        String limit = request.getString("limit");
+        int ilimit = (StringUtils.isBlank(limit)) ? 20 : Integer.valueOf(limit);
+        String page = request.getString("page");
+        Integer ipage = StringUtils.isBlank(page) ? 1 : Integer.valueOf(page);
+
+        Map retmap = goodsService.getGoodsByMap(qmap, ipage, ilimit);
+
+        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;
     }
 }
diff --git a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
index dfd9298..0ad2312 100644
--- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java
@@ -133,7 +133,8 @@ public class OrderController extends BaseController {
      * @return
      */
     @RequestMapping("/createOrder")
-    public JSONObject createOrder(HttpServletRequest request) {
+    public JSONObject createOrder(HttpServletRequest request,@RequestBody String reqstr) {
+        log.info("createOrder:"+reqstr);
         //goods_isli=010007-00000000347399999999-2
         // &is_car=2&user_isli=899998-000000001640-3
         // &use_years=99&random=0.23348573938145045