|
@@ -1,5 +1,6 @@
|
|
|
package com.github.zuihou.api;
|
|
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
@@ -25,8 +26,6 @@ import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.codehaus.jackson.JsonNode;
|
|
|
import org.codehaus.jackson.map.ObjectMapper;
|
|
|
-import org.joda.time.DateTime;
|
|
|
-import org.joda.time.DateTimeZone;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
@@ -38,8 +37,9 @@ import java.io.BufferedReader;
|
|
|
import java.io.IOException;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.*;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
/**
|
|
@@ -106,6 +106,7 @@ public class ExternalApi {
|
|
|
preOrder.setOrderStatus("INIT");
|
|
|
preOrder.setOrderAmount(spe.getSpecSPrice());
|
|
|
preOrder.setOrderGoodsId(spe.getGoodsId());
|
|
|
+ preOrder.setCreateTime(LocalDateTime.now());
|
|
|
// preOrder.setOrderEquId(equId);
|
|
|
orderService.save(preOrder);
|
|
|
// BaseMapper<Order> baseMapper = orderService.getBaseMapper();
|
|
@@ -274,7 +275,7 @@ public class ExternalApi {
|
|
|
// REVOKED:已撤销(付款码支付)
|
|
|
// USERPAYING:用户支付中(付款码支付)
|
|
|
// PAYERROR:支付失败(其他原因,如银行返回失败)
|
|
|
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
String success_time = cipherDto.getSuccess_time();
|
|
|
|
|
|
|
|
@@ -282,8 +283,9 @@ public class ExternalApi {
|
|
|
Order localOrder = orderService.getById(cipherDto.getOut_trade_no());
|
|
|
localOrder.setUpdateTime(LocalDateTime.now());
|
|
|
localOrder.setOrderStatus(trade_state);
|
|
|
- LocalDateTime parse = LocalDateTime.parse(success_time, dtf);
|
|
|
- localOrder.setOrderPayTime(parse);
|
|
|
+// LocalDateTime parse = LocalDateTime.parse(success_time, dtf);
|
|
|
+ LocalDateTime localDateTime = DateUtil.parseLocalDateTime(success_time, "yyyy-MM-dd'T'HH:mm:ssXXX");
|
|
|
+ localOrder.setOrderPayTime(localDateTime);
|
|
|
localOrder.setOrderWxorderId(cipherDto.getTransaction_id());
|
|
|
orderService.updateById(localOrder);
|
|
|
returnMap.put("code", "SUCCESS");
|
|
@@ -323,12 +325,18 @@ public class ExternalApi {
|
|
|
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
- DateTime dt1 = new DateTime(new Date(), DateTimeZone.forTimeZone(TimeZone.getTimeZone("Asia/Shanghai")));
|
|
|
Order order = new Order();
|
|
|
+ order.setCreateTime(LocalDateTime.now());
|
|
|
+ order.setOrderGoodsName("大西瓜呀大西瓜");
|
|
|
+ LocalDateTime localDateTime = DateUtil.parseLocalDateTime("2018-06-08T10:34:56+08:00","yyyy-MM-dd'T'HH:mm:ssXXX");
|
|
|
+ System.out.println(localDateTime);
|
|
|
+//
|
|
|
+// DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
|
|
|
+// LocalDateTime parse = LocalDateTime.parse("2018-06-08T10:34:56+08:00", df);
|
|
|
+ order.setOrderPayTime(localDateTime);
|
|
|
+
|
|
|
+ System.out.println(LocalDateTime.now());
|
|
|
|
|
|
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
- LocalDateTime parse = LocalDateTime.parse("2018-06-08T10:34:56+08:00", df);
|
|
|
- order.setOrderPayTime(parse);
|
|
|
}
|
|
|
|
|
|
}
|