liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-04-25 09:57:48 +08:00
parent f7725bcfc4
commit bcf7cf6137
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/store.go
View File

@@ -4134,7 +4134,6 @@ func GetStoreAcctBalance(ctx *jxcontext.Context, storeID int) (storeAcct *model.
if err != nil { if err != nil {
return nil, err return nil, err
} }
fmt.Println("11", totalIncome, totalExpend)
return &model.StoreAcct{ return &model.StoreAcct{
StoreID: storeID, StoreID: storeID,
AccountBalance: totalIncome - totalExpend, AccountBalance: totalIncome - totalExpend,

3
business/model/dao/store.go
View File

@@ -1,7 +1,6 @@
package dao package dao
import ( import (
"fmt"
"sort" "sort"
"time" "time"
@@ -1071,8 +1070,6 @@ func GetStoreAcctIncomeTotal(db *DaoDB, storeID int, incomeTypes []int, vendorOr
sql += " AND created_at <= ?" sql += " AND created_at <= ?"
sqlParams = append(sqlParams, toTime) sqlParams = append(sqlParams, toTime)
} }
fmt.Println(sql)
fmt.Println(sqlParams)
if err = GetRow(db, &income, sql, sqlParams); err == nil && income != nil { if err = GetRow(db, &income, sql, sqlParams); err == nil && income != nil {
return income.IncomePrice, err return income.IncomePrice, err
} }

6
business/partner/purchase/mtwm/order.go
View File

@@ -407,9 +407,9 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) (orderSta
if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {
if notifyType == mtwmapi.NotifyTypePartyApply { if notifyType == mtwmapi.NotifyTypePartyApply {
if globals.EnableMtwmStoreWrite { if globals.EnableMtwmStoreWrite {
if order, _ := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM); order != nil { //if order, _ := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM); order != nil {
getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderRefundAgree(utils.Str2Int64(orderID), "自动确认退款") // getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderRefundAgree(utils.Str2Int64(orderID), "自动确认退款")
} //}
// goods, err := dao.GetSimpleOrder(dao.GetDB(), orderID) // goods, err := dao.GetSimpleOrder(dao.GetDB(), orderID)
// if err == nil { // if err == nil {
// if goods.Status < model.OrderStatusDelivering { // if goods.Status < model.OrderStatusDelivering {

9
business/partner/purchase/mtwm/order_afs.go
View File

@@ -43,10 +43,11 @@ func (c *PurchaseHandler) isAfsMsg(msg *mtwmapi.CallbackMsg) bool {
orderID := utils.Str2Int64(GetOrderIDFromMsg(msg)) orderID := utils.Str2Int64(GetOrderIDFromMsg(msg))
order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDMTWM) order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDMTWM)
if order != nil { if order != nil {
status, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderViewStatus(orderID) //status, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), order.VendorStoreID).OrderViewStatus(orderID)
if err == nil { //if err == nil {
return utils.Int2Str(status) == mtwmapi.OrderStatusFinished //return utils.Int2Str(status) == mtwmapi.OrderStatusFinished
} return true //有的美团订单售前退款，也当做售后处理试试
//}
} }
//globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err) //globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err)
} }