From 509d10498313921fd795f73b8e7ae9ee43b0a81a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 14:24:29 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java
index 02099a7..47f4f64 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java
@@ -153,7 +153,7 @@
* @return
* @throws Exception
*/
- @PostMapping(value = "/moneyCardPay/{orderId}")
+ @GetMapping(value = "/moneyCardPay/{orderId}")
@ResponseBody
@Transactional
public AjaxResult moneyCardPay(@PathVariable Integer orderId) throws Exception {
@@ -216,7 +216,7 @@
}
shopActivitiesGroupJoinDao.updateByModel(groupJoin);
- SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel());
+ SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel(),order.getCompanyId());
if (sysVipInfo != null) {
sysVipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
sysVipInfoDao.update(sysVipInfo);
--
Gitblit v1.9.1