Commit 2aa6b64b by jinxin

支付时间bug

parent b07a5ec1
......@@ -451,21 +451,27 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
private TabHaobanAppOrder toTabHaobanAppOrder(AppOrderInfoResponseDTO dto,String wxEnterpriseId ){
TabHaobanAppOrder appOrder = JSONObject.parseObject(JSONObject.toJSONString(dto), TabHaobanAppOrder.class);
Date now = new Date();
SimpleDateFormat formatter = new SimpleDateFormat(DateUtil.FORMAT_DATETIME_19);
if (ObjectUtil.isNotNull(dto.getBeginTime())){
Date beginTime = new Date(dto.getBeginTime());
appOrder.setBeginTime(beginTime);
String date_time = formatter.format(new Date(dto.getBeginTime() * 1000L));
Date date = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
appOrder.setBeginTime(date);
}
if(ObjectUtil.isNotNull(dto.getEndTime())){
Date endTime = new Date(dto.getEndTime());
appOrder.setEndTime(endTime);
String date_time = formatter.format(new Date(dto.getEndTime() * 1000L));
Date date = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
appOrder.setEndTime(date);
}
if(ObjectUtil.isNotNull(dto.getPaidTime())){
Date paidTime = new Date(dto.getPaidTime());
appOrder.setPayTime(paidTime);
String date_time = formatter.format(new Date(dto.getPaidTime() * 1000L));
Date date = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
appOrder.setPayTime(date);
}
if(ObjectUtil.isNotNull(dto.getOrderTime())){
Date orderTime = new Date(dto.getOrderTime());
appOrder.setCreateTime(orderTime);
String date_time = formatter.format(new Date(dto.getOrderTime() * 1000L));
Date date = DateUtil.strToDate(date_time, DateUtil.FORMAT_DATETIME_19);
appOrder.setCreateTime(date);
}else {
appOrder.setCreateTime(now);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment