From 55402cc48ecee2ac135624db4d31119b459a1be7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 15:59:51 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 10 ++++++++--
1 files changed, 8 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 0a4c17a..3624ae3 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
@@ -27,6 +27,8 @@
import java.math.BigDecimal;
import java.util.Date;
+import static java.util.Objects.nonNull;
+
/**
* 商业街订单表(McsOrder)表服务实现类
*
@@ -92,7 +94,7 @@
}
// 调用wx支付
String realAppId=appid;
- if(mcsOrder.getOrderNo().equals("JSAPI")){
+ if(mcsOrderVO.getTradeType().equals("JSAPI")){
realAppId=H5_LOGIN_APPID;
}
String result = WxPayUtils.h5pay(realAppId, mchId, payKey, notifyUrl, "点亮支付", mcsOrderVO.getOpenId(),
@@ -131,7 +133,11 @@
mcsOrderBase.setPayTime(mcsOrderVO.getPayTime());
int i=this.baseMapper.updateById(mcsOrderBase);
if(i>0){
- mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getMerchantName(),mcsOrderBase.getConfigId(),mcsOrderBase.getUserId());
+ R r = mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getMerchantName(), 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