From 10cc0db30a1be5377e4c09bce349014a667849b6 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 12 一月 2022 13:21:08 +0800
Subject: [PATCH] Merge branch 'phs' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 b9811a4..453c93e 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,7 @@
import com.panzhihua.service_community.dao.McsOrderDao;
import com.panzhihua.service_community.service.McsMerchantService;
import com.panzhihua.service_community.service.McsOrderService;
+import com.panzhihua.service_community.util.QRCodeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
@@ -43,7 +45,7 @@
@Value("${min.app.mchId}")
private String mchId;
//@Value("${min.app.notifyUrl}")
- private String notifyUrl="www.baidu.com";
+ private String notifyUrl="http://387405oo37.zicp.vip/mcsOrder/wxNotify";
@Resource
private RabbitTemplate rabbitTemplate;
@Resource
@@ -59,7 +61,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);
@@ -70,7 +72,11 @@
@Override
public R detail(Long id) {
- return R.ok(this.baseMapper.detail(id));
+ McsOrderVO detail = this.baseMapper.detail(id);
+ Date cancelAt = DateUtils.addMinutes(detail.getCreateTime(), 30);
+ Date nowDate = new Date();
+ detail.setCancelCountdown(cancelAt.getTime() - nowDate.getTime());
+ return R.ok(detail);
}
@Override
@@ -83,8 +89,12 @@
money = BigDecimal.valueOf(0.01);
}
// 调用wx支付
- String result= WxPayUtils.h5pay(appid, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
- mcsOrderVO.getOrderNo().toString(), money,mcsOrderVO.getTradeType());
+ String result = WxPayUtils.h5pay(appid, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
+ mcsOrder.getOrderNo(), money,mcsOrderVO.getTradeType());
+ if (mcsOrderVO.getTradeType().equals("NATIVE")) {
+ JSONObject jsonObjectResult = JSONObject.parseObject(result);
+ result = QRCodeUtil.getBase64QRCode(jsonObjectResult.get("codeUrl").toString());
+ }
return R.ok(result);
} catch (Exception e) {
log.error("调用微信支付异常,异常原因：" + e.getMessage());
@@ -110,7 +120,7 @@
@Transactional
public R notify(McsOrderVO mcsOrderVO) {
McsOrder mcsOrderBase=this.baseMapper.selectOne(new QueryWrapper<McsOrder>().lambda().eq(McsOrder::getOrderNo,mcsOrderVO.getOrderNo()));
- mcsOrderBase.setStatus(2);
+ mcsOrderBase.setStatus(1);
mcsOrderBase.setPayNo(mcsOrderVO.getPayNo());
mcsOrderBase.setPayTime(mcsOrderVO.getPayTime());
int i=this.baseMapper.updateById(mcsOrderBase);
--
Gitblit v1.7.1