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 6015028..b08e9ff 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java @@ -4,10 +4,7 @@ import cn.chjyj.szwh.bean.*; import cn.chjyj.szwh.controller.BaseController; import cn.chjyj.szwh.exception.ChException; import cn.chjyj.szwh.service.*; -import cn.chjyj.szwh.utils.RedisUtil; -import cn.chjyj.szwh.utils.RedisUtils; -import cn.chjyj.szwh.utils.SzOrderUtils; -import cn.chjyj.szwh.utils.SzwhApiUtils; +import cn.chjyj.szwh.utils.*; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import org.apache.commons.lang3.StringUtils; @@ -176,7 +173,7 @@ public class OrderController extends BaseController { long end =System.currentTimeMillis(); long howuse = (end-start)/1000l; jsonObject.put("code",200); - jsonObject.put("data",retmap.get("rdata")); + jsonObject.put("data",retmap.get("data")); jsonObject.put("msg",retmap.get("msg")); jsonObject.put("useTime",howuse); return jsonObject; 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 37140b0..c9cd212 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -745,10 +745,12 @@ public class OrderServiceImpl implements OrderService { } } bretMap.put("batchcode", batchCode); + return bretMap; }else{ bretMap.put("error","订单创建失败"); + return bretMap; } - return bretMap; + } /** @@ -849,6 +851,8 @@ public class OrderServiceImpl implements OrderService { if(ogd.getGoodsEntrust()==1 || (ogd.getChargesType()==1 && ogd.getGoodsEntrust()==2)){ odgmap.put("transaction_count","-"); } + //购买年限 + odgmap.put("transaction_count",ogd.getTransactionCount()); //付费与否? odgmap.put("charges_type",ogd.getChargesType()); // @@ -950,10 +954,10 @@ public class OrderServiceImpl implements OrderService { String errmsg = (String) bmap.get("error"); if (StringUtils.isNotEmpty(errmsg)) { retmap.put("msg", errmsg); - retmap.put("rdata", ""); + retmap.put("data", ""); } else { retmap.put("msg", "成功"); - retmap.put("rdata", getOrderMapByBatch(batchcode, userIsli)); + retmap.put("data", getOrderMapByBatch(batchcode, userIsli)); } return retmap; }