|
|
@@ -412,8 +412,11 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
|
|
|
String deadline = StringUtilB2C.replaceLineBreak(StringUtilB2C.getStr(deadlineValue));
|
|
|
try {
|
|
|
deadline = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(deadline, 10);
|
|
|
- seekPurchaseByBatch.setDeadline(addTime(new Date(deadline)));
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date deadlineDate = sdf.parse(deadline);
|
|
|
+ seekPurchaseByBatch.setDeadline(addTime(deadlineDate));
|
|
|
} catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
seekPurchaseByBatch.setDeadline(addTime(new Date(System.currentTimeMillis())));
|
|
|
}
|
|
|
}
|
|
|
@@ -575,11 +578,7 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
|
|
|
SeekPurchase seekPurchase = new SeekPurchase();
|
|
|
if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline())) {
|
|
|
//seekPurchase = (SeekPurchase) batch;
|
|
|
- if (batch.getDeadline().getTime() - System.currentTimeMillis() > deadlineTime) {
|
|
|
- seekPurchase.setDeadline(new Date(System.currentTimeMillis() + deadlineTime));
|
|
|
- } else {
|
|
|
- seekPurchase.setDeadline(batch.getDeadline());
|
|
|
- }
|
|
|
+ seekPurchase.setDeadline(batch.getDeadline());
|
|
|
seekPurchase.setCurrency(batch.getCurrency());
|
|
|
seekPurchase.setReleaseDate(batch.getReleaseDate());
|
|
|
seekPurchase.setCode(batch.getCode());
|