物料订单增加配送员等

business/jxcallback/orderman/orderman_ext.go

@@ -1179,23 +1179,8 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde
 		db         = dao.GetDB()
 		orderPays  []*model.OrderPay
 		orderCount = &OrderCount{}
+		orderTime  time.Time
 	)
-	sql2 := `
-		SELECT COUNT(*) count
-		FROM goods_order
-		WHERE IF(store_id = 0,jx_store_id,store_id) = ?
-		AND order_created_at <= NOW() AND order_created_at >= ?
-		AND status = ?
-	`
-	sqlParams2 := []interface{}{
-		storeID,
-		time.Now().AddDate(0, 0, -7),
-		model.OrderStatusFinished,
-	}
-	err = dao.GetRow(db, &orderCount, sql2, sqlParams2)
-	if err != nil {
-		return nil, err
-	}
 	sql := `
 		SELECT b.*
 		FROM goods_order a
@@ -1215,8 +1200,27 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde
 		} else {
 			orderCount.Flag = true
 		}
+		orderTime = *orderPay.PayFinishedAt
 	} else {
+		orderTime = time.Now().AddDate(0, 0, -7)
 		orderCount.Flag = true
 	}
+	sql2 := `
+		SELECT COUNT(*) count
+		FROM goods_order
+		WHERE IF(store_id = 0,jx_store_id,store_id) = ?
+		AND order_created_at <= NOW() AND order_created_at >= ?
+		AND status = ?
+	`
+	sqlParams2 := []interface{}{
+		storeID,
+		orderTime,
+		model.OrderStatusFinished,
+	}
+	err = dao.GetRow(db, &orderCount, sql2, sqlParams2)
+	if err != nil {
+		return nil, err
+	}
+
 	return orderCount, err
 }