From 80608a62d431a1f00f2c9da67606228ca3b8658c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 15 三月 2022 15:10:29 +0800
Subject: [PATCH] 党员认证Bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 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 43093fc..d519b32 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,7 @@
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;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -9,18 +11,25 @@
import com.panzhihua.common.utlis.SmsUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxPayUtils;
+import com.panzhihua.service_community.dao.McsMerchantDAO;
+import com.panzhihua.service_community.entity.McsMerchant;
import com.panzhihua.service_community.entity.McsOrder;
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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
+
+import static java.util.Objects.nonNull;
/**
* 商业街订单表(McsOrder)表服务实现类
@@ -39,10 +48,16 @@
private String payKey;
@Value("${min.app.mchId}")
private String mchId;
- //@Value("${min.app.notifyUrl}")
- private String notifyUrl="www.baidu.com";
+ @Value("${mcs.notifyUrl}")
+ private String notifyUrl;
@Resource
private RabbitTemplate rabbitTemplate;
+ @Resource
+ private McsMerchantService mcsMerchantService;
+ @Resource
+ private McsMerchantDAO mcsMerchantDAO;
+
+ private static String H5_LOGIN_APPID="wx475fcd33c8030df8";
@Override
public R pageList(CommonPage commonPage) {
return R.ok(this.baseMapper.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -50,11 +65,20 @@
@Override
public R insert(McsOrderVO mcsOrderVO) {
+ McsMerchant mcsMerchant = mcsMerchantDAO.selectOne(new QueryWrapper<McsMerchant>().lambda()
+ .eq(McsMerchant::getUserId, mcsOrderVO.getUserId()));
McsOrder mcsOrder=new McsOrder();
BeanUtils.copyProperties(mcsOrderVO,mcsOrder);
+ if (nonNull(mcsMerchant)) {
+ if (mcsMerchant.getIsDel()) {
+ mcsMerchantDAO.deleteById(mcsMerchant.getId());
+ } else {
+ mcsOrder.setMerchantId(mcsMerchant.getId());
+ }
+ }
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);
@@ -65,7 +89,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
@@ -78,8 +106,16 @@
money = BigDecimal.valueOf(0.01);
}
// 调用wx支付
- String result= WxPayUtils.h5pay(appid, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
- mcsOrderVO.getOrderNo().toString(), money,mcsOrderVO.getTradeType());
+ String realAppId=appid;
+ if(mcsOrderVO.getTradeType().equals("JSAPI")){
+ realAppId=H5_LOGIN_APPID;
+ }
+ String result = WxPayUtils.h5pay(realAppId, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
+ mcsOrder.getOrderNo(), money,mcsOrderVO.getTradeType(), mcsOrderVO.getClientIp());
+ 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());
@@ -102,9 +138,21 @@
}
@Override
+ @Transactional
public R notify(McsOrderVO mcsOrderVO) {
- McsOrder mcsOrder=new McsOrder();
- BeanUtils.copyProperties(mcsOrderVO,mcsOrder);
- return R.ok(this.baseMapper.updateById(mcsOrder));
+ McsOrder mcsOrderBase=this.baseMapper.selectOne(new QueryWrapper<McsOrder>().lambda().eq(McsOrder::getOrderNo,mcsOrderVO.getOrderNo()));
+ mcsOrderBase.setStatus(1);
+ mcsOrderBase.setPayNo(mcsOrderVO.getPayNo());
+ mcsOrderBase.setPayTime(mcsOrderVO.getPayTime());
+ mcsOrderBase.setPaymentMethod("微信支付");
+ int i=this.baseMapper.updateById(mcsOrderBase);
+ if(i>0){
+ R r = mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getOrderNo(), mcsOrderBase.getConfigId(), mcsOrderBase.getUserId());
+ if (R.isOk(r) && nonNull(r.getData())) {
+ mcsOrderBase.setMerchantId(JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Long.class));
+ this.baseMapper.updateById(mcsOrderBase);
+ }
+ }
+ return R.ok();
}
}
--
Gitblit v1.7.1