diff --git a/src/main/java/cn/chjyj/szwh/bean/Goods.java b/src/main/java/cn/chjyj/szwh/bean/Goods.java index 53229ed..2b37c17 100644 --- a/src/main/java/cn/chjyj/szwh/bean/Goods.java +++ b/src/main/java/cn/chjyj/szwh/bean/Goods.java @@ -2,6 +2,7 @@ package cn.chjyj.szwh.bean; import com.alibaba.fastjson2.annotation.JSONField; +import java.io.Serializable; import java.math.BigInteger; import java.sql.Timestamp; import java.util.Date; @@ -10,7 +11,8 @@ import java.util.Date; * 交易商品信息 * 2022.06.23 */ -public class Goods { +public class Goods implements Serializable { + private static final long serialVersionUID = 1L; private Integer id; private Integer userId;//用户编号 @JSONField(name = "user_islicode") @@ -219,4 +221,32 @@ public class Goods { public void setContractualtimeEndTime(Timestamp contractualtimeEndTime) { this.contractualtimeEndTime = contractualtimeEndTime; } + + @Override + public String toString() { + return "Goods{" + + "id=" + id + + ", userId=" + userId + + ", userIslicode='" + userIslicode + '\'' + + ", username='" + username + '\'' + + ", goodsDetailId=" + goodsDetailId + + ", goodsIslicode='" + goodsIslicode + '\'' + + ", isLicode='" + isLicode + '\'' + + ", saleCount=" + saleCount + + ", clickCount=" + clickCount + + ", isRecommend=" + isRecommend + + ", recommendSort=" + recommendSort + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", cancelTime=" + cancelTime + + ", goodsStatus=" + goodsStatus + + ", oldStatus=" + oldStatus + + ", entrustStatus=" + entrustStatus + + ", applyOut=" + applyOut + + ", isDeleted=" + isDeleted + + ", contractStatus=" + contractStatus + + ", contractualStartTime=" + contractualStartTime + + ", contractualtimeEndTime=" + contractualtimeEndTime + + '}'; + } } \ No newline at end of file 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 3d26ef4..c0f5399 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java @@ -168,6 +168,7 @@ public class OrderController extends BaseController { //count process use cost time long end =System.currentTimeMillis(); long howuse = (end-start)/1000l; + jsonObject.put("code",200); jsonObject.put("data",retmap.get("rdata")); jsonObject.put("msg",retmap.get("msg")); jsonObject.put("useTime",howuse); diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index 3ce83b4..c424b26 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -847,16 +847,14 @@ public class OrderServiceImpl implements OrderService { String goodsIsli = tmpgjson.getString("goods_isli"); // 检查购物车中是否有该商品 Map ucar = SzCarUtils.getCar(rkey); - String tuseYear = tmpgjson.getString("use_years"); // 产品在购物车中出现 useyear不能正常传入 if("undefined".equals(tuseYear)){ JSONObject inCarJson = (JSONObject) ucar.get(goodsIsli); - tuseYear=inCarJson.getString("use_years"); + tuseYear=inCarJson.getInteger("use_years").toString(); } //todo check it has null Integer ituseYear = Integer.valueOf(tuseYear); - bmap = buyFindGoods(userIsli, goodsIsli, ituseYear); //检查是否有错误信息 String berrmsg = (String) bmap.get("error"); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 31acd80..44c5d41 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -30,7 +30,7 @@ spring.redis.jedis.pool.max-wait=-1 spring.quartz.scheduler-name=szwhQuartz spring.quartz.job-store-type=memory # quartz 自动启动 -spring.quartz.auto-startup=true +spring.quartz.auto-startup=false # 延迟5s启动 spring.quartz.startup-delay=5 # 应用关闭时候等待完成 diff --git a/src/test/java/cn/chjyj/szwh/OtherTest.java b/src/test/java/cn/chjyj/szwh/OtherTest.java index 5014c49..254b086 100644 --- a/src/test/java/cn/chjyj/szwh/OtherTest.java +++ b/src/test/java/cn/chjyj/szwh/OtherTest.java @@ -87,4 +87,17 @@ public class OtherTest { Map mp =SzCarUtils.getCar(key); System.out.println(mp); } + + @Test + public void orderTest(){ + // 发送过来的json + String tpost ="{\"appkey\":\"0acdbb709ee95707\",\"goods\":[{\"goods_isli\":\"010007-00000000349999999999-2\",\"use_years\":\"1\"}],\"timestamp\":\"1667283296\",\"user_isli\":\"899998-000000001640-3\"}"; + JSONObject tpjson = JSONObject.parseObject(tpost); + JSONArray jsonArray = tpjson.getJSONArray("goods"); + // get goodsisli + JSONObject ddjson = jsonArray.getJSONObject(0); + String gisli = ddjson.getString("goods_isli"); + System.out.println("your gisli:"+gisli); + //System.out.println(jsonArray.getJSONObject(0)); + } }