Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

business/model/dao/dao_order.go

@@ -83,12 +83,11 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
 			AND t2.store_id = IF(t4.jx_store_id <> 0, t4.jx_store_id, t4.store_id)
 			AND t4.order_created_at BETWEEN t1.begin_at AND t1.end_at
 			WHERE t1.status = 1
-			AND t1.type = ?
 			AND t1.id = ?
 			GROUP BY 1,2
 		)s ON s.vendor_order_id = a.vendor_order_id AND s.vendor_id = a.vendor_id	
 		`
-		sqlParams = append(sqlParams, model.ActSkuFake, actID)
+		sqlParams = append(sqlParams, actID)
 	}
 	sql += `
 	WHERE 1=1