From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 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 3624ae3..b8c4da8 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
@@ -11,6 +11,8 @@
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;
@@ -52,6 +54,8 @@
private RabbitTemplate rabbitTemplate;
@Resource
private McsMerchantService mcsMerchantService;
+ @Resource
+ private McsMerchantDAO mcsMerchantDAO;
private static String H5_LOGIN_APPID="wx475fcd33c8030df8";
@Override
@@ -61,13 +65,22 @@
@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.getCurrentDateStrNoSignal());
this.baseMapper.insert(mcsOrder);
- rabbitTemplate.convertAndSend("mcsOrder.exchange", "mcsOrder.key", mcsOrder, message -> {
+ rabbitTemplate.convertAndSend("huacheng.mcsOrder.exchange", "huacheng.mcsOrder.key", mcsOrder, message -> {
message.getMessageProperties().setHeader("x-delay", 1000 * 1800);
return message;
});
@@ -131,9 +144,10 @@
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.getMerchantName(), mcsOrderBase.getConfigId(), mcsOrderBase.getUserId());
+ 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);
--
Gitblit v1.7.1