物料订单一周内不能重复下单

business/jxcallback/orderman/orderman_ext.go

@@ -1186,11 +1186,11 @@ func GetMatterStoreOrderCount(ctx *jxcontext.Context, storeID int) (result *Orde
 		JOIN order_pay b ON a.vendor_order_id = b.vendor_order_id
 		WHERE IF(a.store_id = 0, a.jx_store_id, a.store_id) = 666666
 		AND a.from_store_id = ?
-		AND a.status >= ?
+		AND a.status >= ? AND a.status != ?
 		ORDER BY b.pay_finished_at DESC 
 		LIMIT 1
 	`
-	sqlParams := []interface{}{storeID, model.OrderStatusDelivering}
+	sqlParams := []interface{}{storeID, model.OrderStatusDelivering, model.OrderStatusCanceled}
 	err = dao.GetRow(db, &orderPay, sql, sqlParams)
 	if orderPay != nil {
 		if time.Now().Sub(*orderPay.PayFinishedAt).Hours() < 24*7 {