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 a54f127..a615c72 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/GoodsController.java @@ -35,7 +35,7 @@ public class GoodsController extends BaseController { // $goodsService = new GoodsService(); // $this->apilog->info("添加购物车", Request()->param()); // $goodsService->addShoppingCar($user_isli, $goods_isli, $use_years); -// return _success('成功'); + jsonObject.put("msg","成功"); 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 b737f77..935e537 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -82,7 +82,7 @@ public class GoodsServiceImpl implements GoodsService { hmap.put("entrust_token", sign); // get 方式获取 JSONObject jsonObject = RequestUtils.GetData(apiurl, hmap, true); - return opGoodsInfo(jsonObject, host, hmap); + return opGoodsInfo(jsonObject); } /** @@ -476,22 +476,17 @@ public class GoodsServiceImpl implements GoodsService { String host = ProperUtils.getSzwhProp("ENTRUST_URL"); //创建签名 String sign = SignUtils.createSign("entrust"); - // 请求头 - Map hmap = new HashMap(); - hmap.put("entrust_token", sign); //处理json数据 - return opGoodsInfo(jsonObject, host, hmap); + return opGoodsInfo(jsonObject); } /** * 操作商品信息 * * @param jsonObject 待处理的json内容 - * @param host 目标主机地址 - * @param hmap 请求主机头集合 * @return */ - private int opGoodsInfo(JSONObject jsonObject, String host, Map hmap) { + private int opGoodsInfo(JSONObject jsonObject) { // 日期时间格式 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); int count = 0; //统计更新数量 @@ -603,7 +598,7 @@ public class GoodsServiceImpl implements GoodsService { } } } - String ncend = cend + " 23:59:59"; + String ncend = cend + "23:59:59"; // try { //起止时间转为timestamp @@ -641,7 +636,7 @@ public class GoodsServiceImpl implements GoodsService { goods.setCreateTime(nowst); goods.setUpdateTime(nowst); // 添加,返回当前的编号 - int ret_gid = goodsMapper.addGoods(goods); + goodsMapper.addGoods(goods); //添加操作日志 OperationLog oplog = new OperationLog(); oplog.setLogid(goods.getId()); diff --git a/src/test/java/cn/chjyj/szwh/NewTest.java b/src/test/java/cn/chjyj/szwh/NewTest.java index cef262d..931e96e 100644 --- a/src/test/java/cn/chjyj/szwh/NewTest.java +++ b/src/test/java/cn/chjyj/szwh/NewTest.java @@ -2,6 +2,7 @@ package cn.chjyj.szwh; import cn.chjyj.szwh.mapper.FestivalsMapper; import cn.chjyj.szwh.utils.DateUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -68,4 +69,23 @@ public class NewTest { System.out.println(day+"天后的日期:"+aflocal); } + + @Test + public void xnewtest(){ + String cstart="2022-10-12"; + String curTime = new SimpleDateFormat("HH:mm:ss").format(new Date()); + String ncstart = cstart+" "+curTime; + System.out.println(ncstart); + //String ncstart = cstart + " " + curTime; + // 字符串转为时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + Date ndate = sdf.parse(ncstart); + System.out.println(ndate); + //System.out.println("shijian :"+ndate); + }catch (Exception ex){ + ex.printStackTrace(); + } + + } }