入驻时间

@@ -9,7 +9,6 @@ import com.yohobuy.ufo.model.order.bo.MerchantOrderAttachInfo;
 import com.yohobuy.ufo.model.order.bo.OrderInfo;
 import com.yohobuy.ufo.model.order.bo.OrderInfo;
 import com.yohobuy.ufo.model.order.common.OrderCodeType;
 import com.yohobuy.ufo.model.order.common.OrderCodeType;
 import com.yohobuy.ufo.model.order.common.OrderStatus;
 import com.yohobuy.ufo.model.order.common.OrderStatus;
-import com.yohobuy.ufo.model.order.common.TabType;
 import com.yohobuy.ufo.model.order.resp.PageResp;
 import com.yohobuy.ufo.model.order.resp.PageResp;
 import com.yohoufo.common.alarm.CommonAlarmEventPublisher;
 import com.yohoufo.common.alarm.CommonAlarmEventPublisher;
 import com.yohoufo.common.caller.UfoServiceCaller;
 import com.yohoufo.common.caller.UfoServiceCaller;
@@ -20,7 +19,6 @@ import com.yohoufo.order.common.Payment;
 import com.yohoufo.order.model.request.PaymentRequest;
 import com.yohoufo.order.model.request.PaymentRequest;
 import com.yohoufo.order.model.response.PrepayResponse;
 import com.yohoufo.order.model.response.PrepayResponse;
 import com.yohoufo.order.service.cache.CacheCleaner;
 import com.yohoufo.order.service.cache.CacheCleaner;
-import com.yohoufo.order.service.cache.CacheKeyBuilder;
 import com.yohoufo.order.service.impl.PaymentServiceImpl;
 import com.yohoufo.order.service.impl.PaymentServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -325,10 +323,14 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 		if (sw.getStatus() == null || sw.getStatus() == 0) {
 		if (sw.getStatus() == null || sw.getStatus() == 0) {
 			return new com.yohoufo.common.ApiResponse(400, "钱包不可用", null);
 			return new com.yohoufo.common.ApiResponse(400, "钱包不可用", null);
 		}
 		}
+
+		StoredSeller storedSeller =storedSellerService.getValidStoredSeller(uid);
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		JSONObject result = new JSONObject();
 		JSONObject result = new JSONObject();
 		result.put("all", sw.getAmount().add(sw.getLockAmount()).setScale(2).toString());
 		result.put("all", sw.getAmount().add(sw.getLockAmount()).setScale(2).toString());
 		result.put("locked", sw.getLockAmount().setScale(2).toString());
 		result.put("locked", sw.getLockAmount().setScale(2).toString());
 		result.put("avail", sw.getAmount().setScale(2).toString());
 		result.put("avail", sw.getAmount().setScale(2).toString());
+		result.put("entryTime",(storedSeller==null&&storedSeller.getEnterTime()>0)?"":sdf.format(storedSeller.getEnterTime()));
 		return new com.yohoufo.common.ApiResponse(200, "查询成功", result);
 		return new com.yohoufo.common.ApiResponse(200, "查询成功", result);
 	}
 	}