|
|
|
@ -323,11 +323,13 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
info.put("metadataFileFormat", odsJson.getString("metadataFileFormat")); |
|
|
|
// 资源下载地址 ,json 格式
|
|
|
|
String sourceDown = orderGoodsDetailMapper.getOrderGoodsDetailSourceDownload(batchcode, dv.getGoods_islicode()); |
|
|
|
JSONArray sdownJsonArray = JSONArray.parseArray(sourceDown); |
|
|
|
for (int i = 0; i < sdownJsonArray.size(); i++) { |
|
|
|
if (sdownJsonArray.getJSONObject(i).getString("islicode").equals(ods.getLinkcode())) { |
|
|
|
// 是否已经下载。更新下载状态
|
|
|
|
info.put("download_status", sdownJsonArray.getJSONObject(i).getString("status")); |
|
|
|
if(sourceDown!=null) { |
|
|
|
JSONArray sdownJsonArray = JSONArray.parseArray(sourceDown); |
|
|
|
for (int i = 0; i < sdownJsonArray.size(); i++) { |
|
|
|
if (sdownJsonArray.getJSONObject(i).getString("islicode").equals(ods.getLinkcode())) { |
|
|
|
// 是否已经下载。更新下载状态
|
|
|
|
info.put("download_status", sdownJsonArray.getJSONObject(i).getString("status")); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -657,9 +659,9 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
log.error("未查询到用户信息，下单失败" + userIsli); |
|
|
|
bretMap.put("msg",errmsg); |
|
|
|
} |
|
|
|
String oduid =(String)adumap.get("oduid"); |
|
|
|
if(StringUtils.isNotEmpty(oduid)){ |
|
|
|
userId = Integer.valueOf(oduid); |
|
|
|
Integer oduid =(Integer)adumap.get("oduid"); |
|
|
|
if(oduid!=null){ |
|
|
|
userId = oduid; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -901,8 +903,8 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
|
|
|
|
//补充其他元素
|
|
|
|
//retmap.put("close_status", ogd.getCloseStatus());
|
|
|
|
// 查询委托方信息
|
|
|
|
OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode()); |
|
|
|
// 查询委托方信息,购买方
|
|
|
|
OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),od.getBuyIslicode()); |
|
|
|
if(entrUser!=null){ //not null
|
|
|
|
odgmap.put("entrust_name",entrUser.getName()); |
|
|
|
odgmap.put("attesttime",entrUser.getAttesttime()); |
|
|
|
@ -947,7 +949,32 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
List<OrderGoodsSource> ogsourceList = orderGoodsSourceMapper.getOrderGoodsSourceList(ogd.getId().toString()); |
|
|
|
List ogsJsonList = new ArrayList(); |
|
|
|
for(OrderGoodsSource innerOgs:ogsourceList){ |
|
|
|
Map osgsMap = JSONObject.parseObject(JSON.toJSONString(innerOgs)); |
|
|
|
//Map osgsMap = JSONObject.parseObject(JSON.toJSONString(innerOgs));
|
|
|
|
Map osgsMap = new LinkedHashMap(); |
|
|
|
osgsMap.put("servicecode",innerOgs.getServicecode()); |
|
|
|
osgsMap.put("linkcode",innerOgs.getLinkcode()); |
|
|
|
osgsMap.put("publisherid",innerOgs.getPublisherid()); |
|
|
|
osgsMap.put("registrant",innerOgs.getRegistrant()); |
|
|
|
String rsurl=innerOgs.getResolutionUrl(); |
|
|
|
osgsMap.put("resolution_url",rsurl==null?"":rsurl); |
|
|
|
osgsMap.put("source_type",innerOgs.getSourceType()); |
|
|
|
osgsMap.put("source_name_type",innerOgs.getSourceNameType()); |
|
|
|
osgsMap.put("source_name",innerOgs.getSourceName()); |
|
|
|
osgsMap.put("sourceIdentify",innerOgs.getSourceIdentify()); |
|
|
|
osgsMap.put("source_fragment",innerOgs.getSourceFragment()); |
|
|
|
String tartname = innerOgs.getTargetName(); |
|
|
|
osgsMap.put("target_name",tartname); |
|
|
|
osgsMap.put("target_name_type",innerOgs.getTargetNameType()); |
|
|
|
osgsMap.put("targetIdentify",innerOgs.getTargetIdentify()); |
|
|
|
osgsMap.put("target_fragment",innerOgs.getTargetFragment()); |
|
|
|
osgsMap.put("targetFormat",innerOgs.getTargetFormat()); |
|
|
|
osgsMap.put("source_data",innerOgs.getSourceData()); |
|
|
|
osgsMap.put("target_data",innerOgs.getTargetData()); |
|
|
|
osgsMap.put("metadataXml",innerOgs.getMetadataXml()); |
|
|
|
osgsMap.put("cancellation_reason",innerOgs.getCancellationReason()); |
|
|
|
osgsMap.put("cancellationtime",innerOgs.getCancellationtime()); |
|
|
|
osgsMap.put("allocationtime",innerOgs.getAllocationtime()); |
|
|
|
osgsMap.put("datatype",innerOgs.getDatatype()); |
|
|
|
ogsJsonList.add(osgsMap); |
|
|
|
} |
|
|
|
// convert to json
|
|
|
|
@ -1001,9 +1028,9 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
if (goodsJsonArray.size() == 1) { // 下单商品只有一个
|
|
|
|
JSONObject tmpgjson = goodsJsonArray.getJSONObject(0); |
|
|
|
String goodsIsli = tmpgjson.getString("goods_isli"); |
|
|
|
String tuseYear = tmpgjson.getString("use_years"); |
|
|
|
// 检查购物车中是否有该商品
|
|
|
|
Map ucar = SzCarUtils.getCar(rkey); |
|
|
|
String tuseYear = tmpgjson.getString("use_years"); |
|
|
|
// 产品在购物车中出现 useyear不能正常传入
|
|
|
|
if("undefined".equals(tuseYear)){ |
|
|
|
JSONObject inCarJson = (JSONObject) ucar.get(goodsIsli); |
|
|
|
@ -1022,7 +1049,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
//返回订单编号
|
|
|
|
batchcode = (String) bmap.get("batchcode"); |
|
|
|
// 商品从该用户的购物车移除
|
|
|
|
if (ucar.get(goodsIsli) != null) { |
|
|
|
if (ucar!=null && ucar.get(goodsIsli) != null) { |
|
|
|
SzCarUtils.delCart(userIsli, goodsIsli); |
|
|
|
} |
|
|
|
} else { |
|
|
|
@ -1275,7 +1302,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
String userjsonDataStr = userjson.getString("data"); |
|
|
|
if (StringUtils.isBlank(userjsonDataStr)) { |
|
|
|
rmap.put("error", "未查询到用户信息，下单失败"); |
|
|
|
return rmap; |
|
|
|
return null; |
|
|
|
} |
|
|
|
// 提取出json中的内容
|
|
|
|
JSONObject iuserjson = JSONObject.parseObject(userjsonDataStr); |
|
|
|
@ -1285,6 +1312,6 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
//
|
|
|
|
userId = odu.getId(); |
|
|
|
rmap.put("oduid", userId); |
|
|
|
return null; |
|
|
|
return rmap; |
|
|
|
} |
|
|
|
} |
|
|
|
|
xyiege
3 years ago