From bcf7cf6137d1293ecc4ae1715a321f392288a666 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 25 Apr 2021 09:57:48 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go               | 1 -
 business/model/dao/store.go                 | 3 ---
 business/partner/purchase/mtwm/order.go     | 6 +++---
 business/partner/purchase/mtwm/order_afs.go | 9 +++++----
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 0f3910e37..bf07170b6 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -4134,7 +4134,6 @@ func GetStoreAcctBalance(ctx *jxcontext.Context, storeID int) (storeAcct *model.
 	if err != nil {
 		return nil, err
 	}
-	fmt.Println("11", totalIncome, totalExpend)
 	return &model.StoreAcct{
 		StoreID:        storeID,
 		AccountBalance: totalIncome - totalExpend,
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index f697a3c4d..e3439a323 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"fmt"
 	"sort"
 	"time"
 
@@ -1071,8 +1070,6 @@ func GetStoreAcctIncomeTotal(db *DaoDB, storeID int, incomeTypes []int, vendorOr
 		sql += " AND created_at <= ?"
 		sqlParams = append(sqlParams, toTime)
 	}
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	if err = GetRow(db, &income, sql, sqlParams); err == nil && income != nil {
 		return income.IncomePrice, err
 	}
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 9306f29f0..9dce42e74 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -407,9 +407,9 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) (orderSta
 			if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {
 				if notifyType == mtwmapi.NotifyTypePartyApply {
 					if globals.EnableMtwmStoreWrite {
-						if order, _ := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM); order != nil {
-							getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderRefundAgree(utils.Str2Int64(orderID), "自动确认退款")
-						}
+						//if order, _ := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM); order != nil {
+						//	getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderRefundAgree(utils.Str2Int64(orderID), "自动确认退款")
+						//}
 						// goods, err := dao.GetSimpleOrder(dao.GetDB(), orderID)
 						// if err == nil {
 						// if goods.Status < model.OrderStatusDelivering {
diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go
index 1a70744d9..2070c3e76 100644
--- a/business/partner/purchase/mtwm/order_afs.go
+++ b/business/partner/purchase/mtwm/order_afs.go
@@ -43,10 +43,11 @@ func (c *PurchaseHandler) isAfsMsg(msg *mtwmapi.CallbackMsg) bool {
 		orderID := utils.Str2Int64(GetOrderIDFromMsg(msg))
 		order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDMTWM)
 		if order != nil {
-			status, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderViewStatus(orderID)
-			if err == nil {
-				return utils.Int2Str(status) == mtwmapi.OrderStatusFinished
-			}
+			//status, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderViewStatus(orderID)
+			//if err == nil {
+			//return utils.Int2Str(status) == mtwmapi.OrderStatusFinished
+			return true //有的美团订单售前退款，也当做售后处理试试
+			//}
 		}
 		//globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err)
 	}