From 2562e13a8db342cc1e23e17b8a26d84ce314f9eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Aug 2021 12:04:57 +0800
Subject: [PATCH] 20210813
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
index b54a0bc..c241c7e 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
@@ -159,12 +159,12 @@
//设置支付状态为支付成功
modifyMap.put("payStatus", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
//设置订单状态
- if (ShopOrder.ORDER_TYPE_GOODS == order.getOrderType()) {
+ if (ShopOrder.SHIPPING_METHOD_WL == order.getShippingMethod()) {
//如果是商品订单则进入待发货
modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_SEND);
- } else {
- //如果是服务订单则进入待评价
- modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_REMARK);
+ } else if (ShopOrder.SHIPPING_METHOD_MDZT == order.getShippingMethod()) {
+ //如果是门店自提则进入待收款
+ modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_RECEIVE);
}
shopOrderDao.updateByMap(modifyMap);
@@ -187,7 +187,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