diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java
index c1ec80e31..2ebaa9b0c 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtOrder.java
@@ -46,7 +46,7 @@ public class TtOrder extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment")
private Integer payment;
@io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime")
- private Date paymentTime;
+ private String paymentTime;
@Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5", " _-1"})
@io.swagger.annotations.ApiModelProperty(value="\"待付款_0\", \"已支付_1\", \"已取消_2\", \"待退款_3\", \"已退款_4\", \"退款失败_5\", \" _-1\"",name="orderStatus")
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
index fdd339097..f25fd1b37 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
@@ -121,7 +121,7 @@ public class TtOrderServiceImpl implements TtOrderService {
order.setPayment(coupon.getSalePrice());
if(order.getPayment() == null || order.getPayment().intValue() == 0){
order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
- order.setPaymentTime(now);
+// order.setPaymentTime(now);
}else{
order.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());
}
@@ -244,6 +244,8 @@ public class TtOrderServiceImpl implements TtOrderService {
TtOrder orderSuc = new TtOrder();
orderSuc.setId(order.getId());
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
+ orderSuc.setWay(orderQueryResult.getWay());
+ orderSuc.setPaymentTime(orderQueryResult.getPayTime());
orderSuc.setUpdateDate(new Date());
ttOrderMapper.updateById(orderSuc);
return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!");
@@ -306,8 +308,7 @@ public class TtOrderServiceImpl implements TtOrderService {
orderSuc.setId(order.getId());
orderSuc.setOrderStatus(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
orderSuc.setWay(orderQueryResult.getWay());
-// orderSuc.setPaymentTime(orderQueryResult.getPayTime());
- logger.info("支付时间格式---"+orderQueryResult.getPayTime());
+ orderSuc.setPaymentTime(orderQueryResult.getPayTime());
orderSuc.setUpdateDate(new Date());
ttOrderMapper.updateById(orderSuc);
// return new ResultData(ErrorCode.PAY_ORDER_EXIST,"该订单已经支付,请勿重复支付!");
diff --git a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml
index 8e50b855f..758fe7d4d 100644
--- a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml
@@ -16,7 +16,7 @@
-
+
@@ -70,10 +70,10 @@
- and o.`payment_time` >= #{startdate}
+ and o.`create_date` >= #{startdate}
- and o.`payment_time` <= #{enddate}
+ and o.`create_date` <= #{enddate}
@@ -175,10 +175,10 @@
- and o.`payment_time` >= #{startdate}
+ and o.`create_date` >= #{startdate}
- and o.`payment_time` <= #{enddate}
+ and o.`create_date` <= #{enddate}