Merge branch 'liusw-seekpurchase-v1.0.12.12' into liusw-seekpurchase-v2.0.1.13

# Conflicts:
#	src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseServiceImpl.java

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseServiceImpl.java

@@ -28,10 +28,10 @@ import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -158,6 +158,11 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
                 kind = "其他";
             }
         }
+        // 截止日期
+        Long addTime = Long.valueOf(23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+        Long deadline = seekPurchase.getDeadline().getTime();
+        seekPurchase.setDeadline(new Date(addTime + deadline));
+
         seekPurchase.setKind(kind);
         seekPurchase.setReleaseDate(new Date(System.currentTimeMillis()));
         seekPurchase.setStatus(Status.NO_OFFER.getValue());