1

business/jxcallback/orderman/orderman_ext.go

@@ -1019,7 +1019,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 		}
 		return orderMap, orderSkuMap, saleInfoMap
 	}
-	_, _, saleInfoMap := orderSkuHandler(orderSkuList)
+	_, _, saleInfoMap := orderSkuHandler(orderSkuList) // 所有订单的支付金额
 	orderMap, orderSkuMap, _ := orderSkuHandler(orderSkuList4Afs)
 
 	afsOrderMap := make(map[string]*model.GoodsOrder)
@@ -1074,6 +1074,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 		saleInfo.Count++
 	}
 	for _, v := range saleInfoMap {
+		if v.Status == model.OrderStatusFinished {
+			v.PlatformSettlement, _ = dao.GetPlatformSettlement(db, storeIDList, fromTime, toTime)
+		}
 		saleInfoList = append(saleInfoList, v)
 	}
 	return saleInfoList, err

business/model/dao/dao_order.go

@@ -2,7 +2,6 @@ package dao
 
 import (
 	"fmt"
-	"git.rosy.net.cn/jx-callback/globals"
 	"regexp"
 	"strconv"
 	"time"
@@ -38,6 +37,8 @@ type StoresOrderSaleInfo struct {
 	WaybillTipMoney      int64 `json:"waybillTipMoney"`      // 京西加的平台配送小费
 
 	RealEarningPrice int64 `json:"realEarningPrice"`
+
+	PlatformSettlement int64 `json:"platformSettlement"` // 真实订单的平台结算
 }
 
 type OrderSkuWithActualPayPrice struct {
@@ -408,12 +409,30 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt
 		sqlParams = append(sqlParams, model.VendorIDMTWM)
 	}
 
-	globals.SugarLogger.Debugf("==========GetStoreOrderSkuList := %s", sql)
-	globals.SugarLogger.Debugf("==========GetStoreOrderSkuListparm := %s", utils.Format4Output(sqlParams, false))
 	err = GetRows(db, &skuList, sql, sqlParams...)
 	return skuList, err
 }
 
+func GetPlatformSettlement(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time) (int64, error) {
+	sql := `
+		SELECT SUM(t2.total_shop_money) total_shop_money FROM goods_order t2 WHERE t2.order_finished_at >= ? AND t2.order_finished_at <= ? "
+`
+	sqlParams := []interface{}{
+		finishedAtBegin,
+		finishedAtEnd,
+	}
+	if len(storeIDs) > 0 {
+		sql += " AND IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	sql += ` AND t2.status = ? `
+	sqlParams = append(sqlParams, model.OrderStatusFinished)
+
+	var count int64 = 0
+	err := GetRow(db, &count, sql, sqlParams...)
+	return count, err
+}
+
 func GetStoreOrderSkuList4Afs(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, isFinish bool) (skuList []*OrderSkuWithActualPayPrice, err error) {
 	sql := `
 	SELECT t1.*,
@@ -462,8 +481,6 @@ func GetStoreOrderSkuList4Afs2(db *DaoDB, vendorOrderIDs []string) (skuList []*O
 		sqlParams = append(sqlParams, vendorOrderIDs)
 	}
 
-	globals.SugarLogger.Debugf("==========GetStoreOrderSkuList4Afs2 := %s", sql)
-	globals.SugarLogger.Debugf("==========GetStoreOrderSkuList4Afs2 := %s", utils.Format4Output(sqlParams, false))
 	err = GetRows(db, &skuList, sql, sqlParams...)
 	return skuList, err
 }
@@ -509,8 +526,6 @@ func GetStoreAfsOrderSkuList2(db *DaoDB, vendorOrderIDs []string) (afsSkuList []
 		sqlParams = append(sqlParams, vendorOrderIDs)
 	}
 
-	globals.SugarLogger.Debugf("==========GetStoreAfsOrderSkuList2 := %s", sql)
-	globals.SugarLogger.Debugf("==========GetStoreAfsOrderSkuList2 := %s", utils.Format4Output(sqlParams, false))
 	err = GetRows(db, &afsSkuList, sql, sqlParams...)
 	return afsSkuList, err
 }