From adf7566f482080d9fff9dd4429f308433a0e2c2f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 07 一月 2022 16:20:22 +0800
Subject: [PATCH] 商业街代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
index 03be915..0719c85 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
@@ -59,7 +59,7 @@
BeanUtils.copyProperties(mcsOrderVO,mcsOrder);
mcsOrder.setStatus(0);
mcsOrder.setCreateTime(new Date());
- mcsOrder.setOrderNo(DateUtils.getCurrentDateStr());
+ mcsOrder.setOrderNo(DateUtils.getCurrentDateStrNoSignal());
this.baseMapper.insert(mcsOrder);
rabbitTemplate.convertAndSend("mcsOrder.exchange", "mcsOrder.key", mcsOrder, message -> {
message.getMessageProperties().setHeader("x-delay", 1000 * 1800);
@@ -84,7 +84,7 @@
}
// 调用wx支付
String result= WxPayUtils.h5pay(appid, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
- mcsOrderVO.getOrderNo().toString(), money,mcsOrderVO.getTradeType());
+ mcsOrder.getOrderNo(), money,mcsOrderVO.getTradeType());
return R.ok(result);
} catch (Exception e) {
log.error("调用微信支付异常,异常原因：" + e.getMessage());
--
Gitblit v1.7.1