|
|
|
@ -84,7 +84,7 @@ public class GoodsServiceImpl implements GoodsService { |
|
|
|
JSONObject jsonObject = RequestUtils.GetData(apiurl, hmap, true); |
|
|
|
// 产品详情地址
|
|
|
|
String gdurl = host + "/consign/exchange/v1/selectEntrustDetails"; |
|
|
|
return opGoodsInfo(jsonObject,host,hmap); |
|
|
|
return opGoodsInfo(jsonObject, host, hmap); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -554,11 +554,11 @@ public class GoodsServiceImpl implements GoodsService { |
|
|
|
String curTime = new SimpleDateFormat("HH:mm:ss").format(new Date()); |
|
|
|
String ncstart = cstart + " " + curTime; |
|
|
|
// 委托周期
|
|
|
|
int day = nsdjson.getInteger("contractualCycle"); |
|
|
|
Integer day = nsdjson.getInteger("contractualCycle"); |
|
|
|
//转换为date
|
|
|
|
String cend = nsdjson.getString("contractualPeriodEnd"); |
|
|
|
|
|
|
|
if (StringUtils.isBlank(cend)) { |
|
|
|
if (StringUtils.isBlank(cend) && day!=null) { |
|
|
|
|
|
|
|
//如果是一次性授权或单次授权,存在托管结束时间
|
|
|
|
if (iperiod == 2) { |
|
|
|
@ -572,11 +572,6 @@ public class GoodsServiceImpl implements GoodsService { |
|
|
|
ex.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
//永久性
|
|
|
|
if (iperiod == 1) { |
|
|
|
cend = "2099-12-31"; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
String ncend = cend + " 23:59:59"; |
|
|
|
//
|
|
|
|
|