|
|
@ -176,6 +176,12 @@ public class OrderServiceImpl implements OrderService { |
|
|
// 格式化时间
|
|
|
// 格式化时间
|
|
|
//tomap.put("createtime", sdf.format(aod.getCreatetime()));
|
|
|
//tomap.put("createtime", sdf.format(aod.getCreatetime()));
|
|
|
|
|
|
|
|
|
|
|
|
// 购买者
|
|
|
|
|
|
OrderUser oduser = orderUserMapper.getUserOrder(aod.getBatchcode(), aod.getBuy_islicode()); |
|
|
|
|
|
if(oduser!=null) { |
|
|
|
|
|
tomap.put("buy_username", oduser.getName()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// 获取授权方
|
|
|
// 获取授权方
|
|
|
String entrustName = ""; |
|
|
String entrustName = ""; |
|
|
JSONObject ujson = SzwhApiUtils.getApiUser(aod.getEntrust_islicode()); |
|
|
JSONObject ujson = SzwhApiUtils.getApiUser(aod.getEntrust_islicode()); |
|
|
@ -197,6 +203,10 @@ public class OrderServiceImpl implements OrderService { |
|
|
tomap.put("total_money", aod.getTotal_money()); |
|
|
tomap.put("total_money", aod.getTotal_money()); |
|
|
tomap.put("status", aod.getStatus()); |
|
|
tomap.put("status", aod.getStatus()); |
|
|
tomap.put("id", aod.getId()); |
|
|
tomap.put("id", aod.getId()); |
|
|
|
|
|
//下单时间
|
|
|
|
|
|
tomap.put("createtime", aod.getCreatetime()); |
|
|
|
|
|
//订单编号
|
|
|
|
|
|
tomap.put("batchcode", aod.getBatchcode()); |
|
|
//
|
|
|
//
|
|
|
relist.add(tomap); |
|
|
relist.add(tomap); |
|
|
} |
|
|
} |
|
|
@ -206,11 +216,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
// Map tomap = new HashMap();
|
|
|
// Map tomap = new HashMap();
|
|
|
// //订单编号
|
|
|
// //订单编号
|
|
|
// tomap.put("batchcode", od.getBatchcode());
|
|
|
// tomap.put("batchcode", od.getBatchcode());
|
|
|
// // 购买者
|
|
|
|
|
|
// OrderUser oduser = orderUserMapper.getUserOrder(od.getBatchcode(), od.getBuyIslicode());
|
|
|
|
|
|
// if(oduser!=null) {
|
|
|
|
|
|
// tomap.put("buy_username", oduser.getName());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //下单时间
|
|
|
// //下单时间
|
|
|
// tomap.put("createtime", sdf.format(od.getCreatetime()));
|
|
|
// tomap.put("createtime", sdf.format(od.getCreatetime()));
|
|
|
// //entrust_name 委托人信息,
|
|
|
// //entrust_name 委托人信息,
|
|
|
|