cup 3 年之前
父節點
當前提交
65eb0f7935

+ 1 - 1
mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -273,7 +273,7 @@ public class ChannelOrderServiceImpl extends
     boolean rst = update(
         new LambdaUpdateWrapper<ChannelOrder>().set(ChannelOrder::getStatus,
                 ChannelOrderStatusEnum.NOT_DELIVER)
-                .set(ChannelOrder::getPayTime, new Date())
+                .set(ChannelOrder::getPayTime, payOrder.getCompleteDate())
             .eq(ChannelOrder::getOrderId, channelOrder.getOrderId())
             .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_PAY));
     if (!rst) {

+ 2 - 1
mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.pay.domain.PayOrder;
 import com.qs.mp.system.service.id.BizIdGenerator;
@@ -151,7 +152,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
       throw new ServiceException("支付回调用户提货订单处理,订单状态异常,不是待支付。orderId:" + payOrder.getBizId());
     }
     deliverOrder.setStatus(DeliverOrderStatusEnum.NOT_DELIVER);
-      deliverOrder.setPayTime(new Date());
+      deliverOrder.setPayTime(DateUtils.parseDate(payOrder.getCompleteDate()));
     boolean rst = updateById(deliverOrder);
     Assert.isTrue(rst, "支付回调用户提货订单处理,更新订单状态失败,orderId:" + deliverOrder.getOrderId());
     return false;

+ 3 - 1
mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -35,6 +35,7 @@ import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.enums.UserCouponStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.RSAUtil;
 import com.qs.mp.common.utils.StringUtils;
@@ -386,6 +387,7 @@ public class UserTicketOrderServiceImpl extends
           JSONObject.toJSONString(payOrder), JSONObject.toJSONString(ticketOrder));
       throw new ServiceException("支付回调用户购票订单处理,订单状态异常,不是待支付。orderId:" + payOrder.getBizId());
     }
+    ticketOrder.setPayTime(DateUtils.parseDate(payOrder.getCompleteDate()));
     return processTicketOrder(ticketOrder);
   }
 
@@ -420,7 +422,7 @@ public class UserTicketOrderServiceImpl extends
     boolean updateRst = update(
         new LambdaUpdateWrapper<UserTicketOrder>().set(UserTicketOrder::getStatus,
                 UserTicketOrderStatusEnum.FINISHED)
-            .set(UserTicketOrder::getPayTime, new Date())
+            .set(UserTicketOrder::getPayTime, ticketOrder.getPayTime())
             .eq(UserTicketOrder::getOrderId, ticketOrder.getOrderId())
             .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.NOT_PAY));
     Assert.isTrue(updateRst, "支付回调用户购票订单处理,更新订单状态失败,orderId:" + ticketOrder.getOrderId());