|
@@ -1,6 +1,5 @@
|
|
|
package com.ruixuan.isc.entity;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruixuan.common.utils.Check;
|
|
|
import com.ruixuan.common.utils.DateUtils;
|
|
@@ -514,7 +513,9 @@ public class KwaixiaodianOrderCursorList {
|
|
|
JSONObject orderBaseInfo = object.getJSONObject("orderBaseInfo");
|
|
|
if (Check.isNotNull(orderBaseInfo)) {
|
|
|
this.setOid(orderBaseInfo.getLong("oid"));
|
|
|
- this.setPayTime(orderBaseInfo.getLong("payTime"));
|
|
|
+ if (!Check.isNull(orderBaseInfo.getLong("payTime"))) {
|
|
|
+ this.setPayTime(Long.valueOf(DateUtils.timestamptoStr(orderBaseInfo.getLong("payTime"))));
|
|
|
+ }
|
|
|
this.setBuyerImage(orderBaseInfo.getString("buyerImage"));
|
|
|
this.setBuyerOpenId(orderBaseInfo.getString("buyerOpenId"));
|
|
|
this.setBuyerNick(orderBaseInfo.getString("buyerNick"));
|
|
@@ -522,8 +523,13 @@ public class KwaixiaodianOrderCursorList {
|
|
|
this.setDiscountFee(orderBaseInfo.getLong("discountFee"));
|
|
|
this.setTotalFee(orderBaseInfo.getLong("totalFee"));
|
|
|
this.setStatus(orderBaseInfo.getLong("status"));
|
|
|
- this.setSendTime(orderBaseInfo.getLong("sendTime"));
|
|
|
- this.setRefundTime(orderBaseInfo.getLong("refundTime"));
|
|
|
+ if (!Check.isNull(orderBaseInfo.getLong("sendTime"))) {
|
|
|
+ this.setSendTime(Long.valueOf(DateUtils.timestamptoStr(orderBaseInfo.getLong("sendTime"))));
|
|
|
+ }
|
|
|
+ if (!Check.isNull(orderBaseInfo.getLong("refundTime"))) {
|
|
|
+ this.setRefundTime(Long.valueOf(DateUtils.timestamptoStr(orderBaseInfo.getLong("refundTime"))));
|
|
|
+ }
|
|
|
+
|
|
|
this.setCreateTime(orderBaseInfo.getString("createTime"));
|
|
|
this.setStatDate(Long.valueOf(DateUtils.timestamptoStr(orderBaseInfo.getLong("createTime"))));
|
|
|
this.setStatHour(DateUtils.timestamptoHour(orderBaseInfo.getLong("createTime")));
|
|
@@ -534,7 +540,9 @@ public class KwaixiaodianOrderCursorList {
|
|
|
this.setCpsType(orderBaseInfo.getLong("cpsType"));
|
|
|
this.setValidPromiseShipmentTimeStamp(orderBaseInfo.getLong("validPromiseShipmentTimeStamp"));
|
|
|
this.setPreSale(orderBaseInfo.getLong("preSale"));
|
|
|
- this.setRecvTime(orderBaseInfo.getLong("recvTime"));
|
|
|
+ if (!Check.isNull(orderBaseInfo.getLong("recvTime"))) {
|
|
|
+ this.setRecvTime(Long.valueOf(DateUtils.timestamptoStr(orderBaseInfo.getLong("recvTime"))));
|
|
|
+ }
|
|
|
this.setCoType(orderBaseInfo.getLong("coType"));
|
|
|
this.setCommentStatus(orderBaseInfo.getLong("commentStatus"));
|
|
|
this.setPayType(orderBaseInfo.getLong("payType"));
|