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 31d2594..0fa28a7 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -648,9 +648,12 @@ public class OrderServiceImpl implements OrderService { orderGoodsDetail.setIslicode(goods.getIsLicode()); // 查找用户 OrderUser orderUser = orderUserMapper.getUserOrder(batchCode, goods.getIsLicode()); + // 购买人信息 + String buyUserName = ""; int userId = 0; if (orderUser != null) { userId = orderUser.getId(); + buyUserName = orderUser.getName(); } else { Map adumap = addOrderUserByBatchacode(batchCode,userIsli,goodsIsli); if(adumap!=null){ @@ -658,11 +661,14 @@ public class OrderServiceImpl implements OrderService { if(StringUtils.isNotEmpty(errmsg)){ log.error("未查询到用户信息,下单失败" + userIsli); bretMap.put("msg",errmsg); + // 返回 + return bretMap; } Integer oduid =(Integer)adumap.get("oduid"); if(oduid!=null){ userId = oduid; } + buyUserName = (String)adumap.get("buser"); } } //设置用户信息 @@ -756,7 +762,7 @@ public class OrderServiceImpl implements OrderService { gstmap.put("goods_status", gsstatus); goodsMapper.updateGoods(gstmap, goods.getId()); //更新订单用户状态信息 - String buyUserName = orderUser.getName(); + OperationLog oplog = new OperationLog(); oplog.setType("goods"); oplog.setLogid(goods.getId()); @@ -1035,6 +1041,7 @@ public class OrderServiceImpl implements OrderService { if("undefined".equals(tuseYear)){ JSONObject inCarJson = (JSONObject) ucar.get(goodsIsli); tuseYear=inCarJson.getInteger("use_years").toString(); + log.info("cord_tuy:"+tuseYear); } //todo check it has null Integer ituseYear = Integer.valueOf(tuseYear); @@ -1061,6 +1068,8 @@ public class OrderServiceImpl implements OrderService { //1、订单号一个 2、用户一个 3、订单商品(一)多个 4、操作购物车 // export order map // order basic \order goods |order user + log.info("afterCord:"); + log.info(JSON.toJSON(bmap)); // 检查是否有执行过程中的错误 String errmsg = (String) bmap.get("error"); if (StringUtils.isNotEmpty(errmsg)) { @@ -1312,6 +1321,8 @@ public class OrderServiceImpl implements OrderService { // userId = odu.getId(); rmap.put("oduid", userId); + // 购买方 + rmap.put("buser",odu.getName()); return rmap; } }