From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java | 9 ++++-----
1 files changed, 4 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 dde86bb..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
@@ -10,7 +10,6 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
-import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.hive.bean.MoneyCardUse;
import com.matrix.system.hive.bean.MoneyCardUseFlow;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -160,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);
--
Gitblit v1.9.1