From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 3061365..9d08cae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -696,7 +696,7 @@
         shopOrderDO.setPayStatus(ComShopOrderDO.payStatus.yes);
         shopOrderDO.setPayAmount(BigDecimal.valueOf(Integer.parseInt(wxPayNotifyOrderDTO.getCashFee()) / 100));
         shopOrderDO.setWxTardeNo(wxPayNotifyOrderDTO.getWxTradeNo());
-        shopOrderDO.setPayTime(new Date(Long.parseLong(wxPayNotifyOrderDTO.getPayTime())));
+        shopOrderDO.setPayTime(new Date(Long.parseLong(wxPayNotifyOrderDTO.getPayTime() + "000")));
         this.baseMapper.updateById(shopOrderDO);
 
         //查询订单商品
@@ -728,7 +728,6 @@
                 comShopStoreDAO.updateById(storeDO);
             }
         }
-
 
         //添加订单操作记录
         ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();

--
Gitblit v1.7.1